[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Upd
From: |
Danny Milosavljevic |
Subject: |
[bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update package definition. |
Date: |
Thu, 20 Aug 2020 17:10:25 +0200 |
From: Raghav Gururajan <raghavgururajan@disroot.org>
* gnu/packages/glib.scm (glib-with-documentation): Update package
definition.
[properties]: Remove field.
[native-inputs]: Remove libxml2.
[arguments]<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: Modify phase.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/glib.scm | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 057b90eaa1..55ffdf724e 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -291,27 +291,40 @@ threads, dynamic loading, and an object system.")
;; which in turn depends on glib.
(package
(inherit glib)
- (properties (alist-delete 'hidden? (package-properties glib)))
- (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference
(native-inputs
- `(("gtk-doc" ,gtk-doc) ; for the doc
- ("docbook-xml" ,docbook-xml)
- ("libxml2" ,libxml2)
+ `(("gtk-doc" ,gtk-doc)
+ ("docbook-xml-4.2" ,docbook-xml-4.2)
+ ("docbook-xml-4.5" ,docbook-xml)
,@(package-native-inputs glib)))
+ (outputs (cons "doc" (package-outputs glib)))
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:configure-flags flags ''())
`(cons "-Dgtk_doc=true" ,flags))
((#:phases phases)
`(modify-phases ,phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs/reference"
+ (substitute* '("gio/gdbus-object-manager-example/.*\\.xml"
+ "gio/.*\\.xml" "glib/.*\\.xml"
"gobject/.*\\.xml")
+ (("http://www.oasis-open.org/docbook/xml/4.5/")
+ (string-append (assoc-ref inputs "docbook-xml-4.5")
+ "/xml/dtd/docbook/")))
+ (substitute* "gio/gio.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.2")
+ "/xml/dtd/docbook/"))))
+ #t))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(html (string-append "/share/gtk-doc")))
- (copy-recursively (string-append out html)
- (string-append doc html))
- (delete-file-recursively (string-append out html))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out html)
+ (string-append doc html))
#t)))))))))
(define gobject-introspection
- [bug#42958] [PATCH core-updates 00/29] Big changes from wip-desktop., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update package definition.,
Danny Milosavljevic <=
- [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 10/29] gnu: cairo: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 16/29] gnu: libgsf: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 22/29] gnu: atkmm: Update package definition., Danny Milosavljevic, 2020/08/20