From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 47770@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation.
Date: Wed, 14 Apr 2021 07:53:47 -0400 [thread overview]
Message-ID: <20210414115349.14040-2-rg@raghavgururajan.name> (raw)
In-Reply-To: <20210414115349.14040-1-rg@raghavgururajan.name>
* gnu/packages/ibus.scm (ibus)[outputs](doc): New output.
[configure-flags](enable-gtk-doc): New flag.
[phases](patch-docbook-xml): New phase.
(move-doc): New phase.
[native-inputs]: Add docbook-xml and gtk-doc.
---
gnu/packages/ibus.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index e566993b08..b6687239df 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -42,6 +42,7 @@
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages dbm)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -73,10 +74,12 @@
(base32
"07s2ly75xv50bqg37mn37i9akqvcfd45k2mbplxrsqk3a2b3mwxb"))))
(build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
(arguments
`(#:tests? #f ; tests fail because there's no connection to dbus
#:parallel-build? #f ; race condition discovered with emoji support
#:configure-flags (list "--enable-python-library"
+ "--enable-gtk-doc"
(string-append
"--with-unicode-emoji-dir="
(assoc-ref %build-inputs "unicode-emoji")
@@ -91,6 +94,14 @@
"--enable-wayland")
#: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))
(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))
+ (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)))
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
@@ -160,10 +180,12 @@
("wayland" ,wayland)
("xmodmap" ,xmodmap)))
(native-inputs
- `(("glib" ,glib "bin") ; for glib-genmarshal
+ `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("glib" ,glib "bin") ; for glib-genmarshal
("gettext" ,gettext-minimal)
("gnome-common" ,gnome-common)
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
+ ("gtk-doc" ,gtk-doc)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
--
2.31.1
next prev parent reply other threads:[~2021-04-14 12:48 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 ` Raghav Gururajan via Guix-patches via [this message]
2021-04-14 21:21 ` [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation Maxime Devos
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414115349.14040-2-rg@raghavgururajan.name \
--to=guix-patches@gnu.org \
--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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.