From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Neidhardt Subject: bug#37850: Glib documentation is missing Date: Fri, 15 Nov 2019 16:06:15 +0100 Message-ID: <87h8352n88.fsf@ambrevar.xyz> References: <87v9sbj2ru.fsf@ambrevar.xyz> <87h83ret3a.fsf@ambrevar.xyz> <87k18gncbn.fsf@ambrevar.xyz> <8736f4ok77.fsf@devup.no> <87ftj4m0s0.fsf@ambrevar.xyz> <8736ewmyc1.fsf@devup.no> <87woc6kbhc.fsf@ambrevar.xyz> <20191112123233.jkcevtpkz5i2yut5@pelzflorian.localdomain> <20191112132254.hzqo2zck3btcerdb@pelzflorian.localdomain> <87h839gk47.fsf@ambrevar.xyz> <20191112183458.fmlullhdc65bp2am@pelzflorian.localdomain> <87tv752xth.fsf@ambrevar.xyz> <87d0dtgri5.fsf@devup.no> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:40093) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVdBf-0001C7-T8 for bug-guix@gnu.org; Fri, 15 Nov 2019 10:07:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVdBe-0007Oh-HT for bug-guix@gnu.org; Fri, 15 Nov 2019 10:07:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVdBe-0007Od-DF for bug-guix@gnu.org; Fri, 15 Nov 2019 10:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iVdBe-0007Xx-6Z for bug-guix@gnu.org; Fri, 15 Nov 2019 10:07:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87d0dtgri5.fsf@devup.no> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Marius Bakke , "pelzflorian (Florian Pelz)" Cc: 37850@debbugs.gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Oh, that makes total sense, thanks for the explanation Marius! Alright, final patch attached. Let me know if I should merge on master. =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl3OvucACgkQm9z0l6S7 zH8OnAgArCqfKfeY2fQsXNzk8uXqElZ1Y5Zr9aSOkGC5BlYHVPaRjXa+z/lwiN1p tnCFVu0Si96Cm0MoAYrZlQHYDM9p91kZKDlj+etYj4vLefAh4FQuuC4T0+VhmY6t Fq4Cz/2s0vsCWspYuB9tETw3pp34vah7h0yYLAhsuqQDAJluuciyUzaB7/Hz7TPx zbGjqOWJyVBMPUrf8pg/5B1HJmSdD5vpovzD3PdpFK9d2OLOL2RqlT+US5JqJN3B /oldtK13w0vDs/teVbfcFMEXj064lJNMgrw99RXnWqrzaA6dXY3UA1PJV6dMcQ4G 9pf+fzPr8/tYu/o+mukeh2qxCWNIIQ== =BhAJ -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-glib-with-documentation.patch >From 29d27b64fb7bbf96a2ed59a3e1c4179717770f5c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 11 Nov 2019 15:38:11 +0100 Subject: [PATCH] gnu: Add glib-with-documentation. * gnu/packages/glib.scm (glib-with-documentation): New variable. (glib): Hide package. --- gnu/packages/glib.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b3e85f8df9..47e4f7006a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -339,6 +339,7 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) + (properties '((hidden? . #t)) ) (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") (description @@ -348,6 +349,45 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) +(define-public glib-with-documentation + ;; glib's doc must be built in a separate package since it requires gtk-doc, + ;; which in turn depends on glib. + (package + (inherit glib) + (properties '((hidden? . #f))) + (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) + ,@(package-native-inputs glib))) + (arguments + (substitute-keyword-arguments (package-arguments glib) + ((#:configure-flags flags ''()) + `(cons "-Dgtk_doc=true" ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-local-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let ((replace-http + (lambda (file) + (substitute* file + ;; Warning: gio.xml uses docbook 4.2, hence the "4.." pattern. + (("http://www.oasis-open.org/docbook/xml/4../docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd")))))) + (replace-http "gio/gdbus-2.0/codegen/codegen_docbook.py") + (for-each replace-http (find-files "." "\\.xml$")) + #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)) + #t))))))))) + (define gobject-introspection (package (name "gobject-introspection") -- 2.23.0 --=-=-=--