unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxime Devos <maximedevos@telenet.be>
To: Raghav Gururajan <rg@raghavgururajan.name>, 47770@debbugs.gnu.org
Subject: [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation.
Date: Wed, 14 Apr 2021 23:21:44 +0200	[thread overview]
Message-ID: <45ef6247d0c39df7be8e0fce23d9b608921c12f5.camel@telenet.be> (raw)
In-Reply-To: <20210414115349.14040-2-rg@raghavgururajan.name>

[-- Attachment #1: Type: text/plain, Size: 1755 bytes --]

On Wed, 2021-04-14 at 07:53 -0400, Raghav Gururajan via Guix-patches via wrote:
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-docbook-xml
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (with-directory-excursion "docs/reference/ibus"
> +               (substitute* "ibus-docs.sgml.in"
> +                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
> +                  (string-append (assoc-ref inputs "docbook-xml")
> +                                 "/xml/dtd/docbook/"))))
> +              #t))

Letting a phase return #t isn't required anymore, and the warning has
been removed on core-updates (which this patch series is targetting.
The #t can be dropped now.

>           (add-after 'unpack 'patch-python-target-directories
>             (lambda* (#:key outputs #:allow-other-keys)
>               (let ((root (string-append (assoc-ref outputs "out")
> @@ -127,6 +138,15 @@
>                 (("\"(setxkbmap|xmodmap)\"" _ prog)
>                  (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))
>               #t))

While you're modifying the package anyway, you might as well drop this one too.
> +         (add-after 'install 'move-doc
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (doc (assoc-ref outputs "doc")))
> +               (mkdir-p (string-append doc "/share"))
> +               (rename-file
> +                (string-append out "/share/gtk-doc")
> +                (string-append doc "/share/gtk-doc"))
> +               #t)))
Likewise.

Warning: I didn't test this patch series.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

  reply	other threads:[~2021-04-14 21:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-14 11:42 [bug#47770] [PATCH core-updates 0/4] Update ibus Raghav Gururajan via Guix-patches via
2021-04-14 11:53 ` [bug#47770] [PATCH core-updates 1/4] gnu: ibus: Update to 1.5.24 Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation Raghav Gururajan via Guix-patches via
2021-04-14 21:21     ` Maxime Devos [this message]
2021-04-15 12:31       ` Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 3/4] gnu: ibus: Enable memconf Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 4/4] gnu: ibus: Enable tests Raghav Gururajan via Guix-patches via
2021-04-14 21:24     ` Maxime Devos
2021-04-15 12:33       ` Raghav Gururajan via Guix-patches via
2021-04-15 12:28 ` [bug#47770] [PATCH core-updates v2 1/5] gnu: ibus: Update to 1.5.24 Raghav Gururajan via Guix-patches via
2021-04-15 12:28   ` [bug#47770] [PATCH core-updates v2 2/5] gnu: ibus: Enable documentation Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` [bug#47770] [PATCH core-updates v2 3/5] gnu: ibus: Enable memconf Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` [bug#47770] [PATCH core-updates v2 4/5] gnu: ibus: Enable tests Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` [bug#47770] [PATCH core-updates v2 5/5] gnu: ibus: Remove trailing #t in phases Raghav Gururajan via Guix-patches via
2021-04-16 15:42 ` bug#47770: (no subject) Raghav Gururajan via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45ef6247d0c39df7be8e0fce23d9b608921c12f5.camel@telenet.be \
    --to=maximedevos@telenet.be \
    --cc=47770@debbugs.gnu.org \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).