[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/334: gnu: glib-with-documentation: Update package definition.
From: |
guix-commits |
Subject: |
41/334: gnu: glib-with-documentation: Update package definition. |
Date: |
Sat, 15 Aug 2020 16:26:14 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit c6d6a63f8997313fef6bf8ae4da8553587105ab7
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Wed Jun 24 22:15:44 2020 -0400
gnu: glib-with-documentation: Update package definition.
* 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 b5b3c87..36d7278 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -292,27 +292,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
- 16/334: gnu: clutter: Update to 1.26.4., (continued)
- 16/334: gnu: clutter: Update to 1.26.4., guix-commits, 2020/08/15
- 17/334: gnu: clutter-gtk: Update package definition., guix-commits, 2020/08/15
- 18/334: gnu: clutter-gst: Update package definition., guix-commits, 2020/08/15
- 19/334: gnu: cogl: Update package definition., guix-commits, 2020/08/15
- 24/334: gnu: enchant: Update package definition., guix-commits, 2020/08/15
- 33/334: gnu: gjs: Update to 1.58.8., guix-commits, 2020/08/15
- 26/334: gnu: fcitx: Update package definition., guix-commits, 2020/08/15
- 29/334: gnu: gdk-pixbuf: Update package definition., guix-commits, 2020/08/15
- 30/334: gnu: gdk-pixbuf+svg: Update package definition., guix-commits, 2020/08/15
- 39/334: gnu: faad2: Update to 2.8.8., guix-commits, 2020/08/15
- 41/334: gnu: glib-with-documentation: Update package definition.,
guix-commits <=
- 23/334: gnu: enchant-1.6: Update package definition., guix-commits, 2020/08/15
- 32/334: gnu: Add sysprof., guix-commits, 2020/08/15
- 54/334: gnu: Add libmpeg3., guix-commits, 2020/08/15
- 73/334: gnu: Add mediasdk., guix-commits, 2020/08/15
- 21/334: gnu: Add ronn., guix-commits, 2020/08/15
- 22/334: gnu: Add nuspell., guix-commits, 2020/08/15
- 27/334: gnu: gcab: Update to 1.4., guix-commits, 2020/08/15
- 34/334: gnu: glib-networking: Update to 2.62.4., guix-commits, 2020/08/15
- 35/334: gnu: Add mutest., guix-commits, 2020/08/15
- 38/334: gnu: Add esound., guix-commits, 2020/08/15