From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#37850: Glib documentation is missing Date: Thu, 21 Nov 2019 20:50:16 +0100 Message-ID: <87d0dl80w7.fsf@devup.no> 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> <87h8352n88.fsf@ambrevar.xyz> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:38171) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXsTt-0006kA-BD for bug-guix@gnu.org; Thu, 21 Nov 2019 14:51:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXsTr-0004o3-1j for bug-guix@gnu.org; Thu, 21 Nov 2019 14:51:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXsTp-0004mU-FW for bug-guix@gnu.org; Thu, 21 Nov 2019 14:51:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXsTp-0000o9-6A for bug-guix@gnu.org; Thu, 21 Nov 2019 14:51:05 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87h8352n88.fsf@ambrevar.xyz> 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: Pierre Neidhardt , "pelzflorian (Florian Pelz)" Cc: 37850@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Pierre Neidhardt writes: > Oh, that makes total sense, thanks for the explanation Marius! > > Alright, final patch attached. > Let me know if I should merge on master. Looks good! > 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. This should say (glib)[properties]: ... [...] =20=20 > +(define-public glib-with-documentation > + ;; glib's doc must be built in a separate package since it requires gt= k-doc, > + ;; which in turn depends on glib. > + (package > + (inherit glib) > + (properties '((hidden? . #f))) Using (alist-delete 'hidden? (package-properties glib)) is more future proof. :-) > + (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference > + (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=3Dtrue" ,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 th= e "4.." pattern. > + (("http://www.oasis-open.org/docbook/xml/4../d= ocbookx.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))) Can this phase be removed if you add 'libxml2' to inputs (for the $XML_CATALOG_FILES search path)? Otherwise LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl3W6ngACgkQoqBt8qM6 VPpeuQf+MpHD6VPO5GoJoZGwMYAgDtztPOJMbzl45I+60ZrvSz8Xlkx9Wh6gESCQ ypqQBhWi0EN+F+QL+qF9dDJ/bWDqCjBB0dLSvrhLUjPicA3z5jKWDWi7yXdkXlqS hdg8bm6QbbExL+izuXkHr6k7Lbk841ut97t6jYeOO/gHuExr3zSZyXO1A6DM7WOK 90P+2n2tg7qbPfMxq9WUeRps4Bpu+zduGRn5Msw3+o0E7XpprCl6fWlRfH0bH6HV OIIGqOVjHp+CQP1L8ydD+iYR2rIKeKSibHBaoHCia3hej8y4vp0znWv5QGjKiVSL 0nvJoepK2OvruHqph5TKlbIm23hqbA== =CNx9 -----END PGP SIGNATURE----- --=-=-=--