From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id xyhJMoCWbF80NgAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 12:52:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6ISSLYCWbF/GdwAAB5/wlQ (envelope-from ) for ; Thu, 24 Sep 2020 12:52:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 27C3D940224 for ; Thu, 24 Sep 2020 12:52:16 +0000 (UTC) Received: from localhost ([::1]:45256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLQjN-00040N-9z for larch@yhetil.org; Thu, 24 Sep 2020 08:52:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLQjC-000404-Pv for guix-patches@gnu.org; Thu, 24 Sep 2020 08:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLQjC-0007Nx-Fu for guix-patches@gnu.org; Thu, 24 Sep 2020 08:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLQjC-0007Xt-E8 for guix-patches@gnu.org; Thu, 24 Sep 2020 08:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, package definition. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 12:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Raghav Gururajan Cc: 42958@debbugs.gnu.org Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.160095189328969 (code B ref 42958); Thu, 24 Sep 2020 12:52:02 +0000 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:51:33 +0000 Received: from localhost ([127.0.0.1]:38895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQij-0007XB-0T for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:51:33 -0400 Received: from flashner.co.il ([178.62.234.194]:54694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQih-0007Ww-1N for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:51:32 -0400 Received: from localhost (unknown [31.210.181.177]) by flashner.co.il (Postfix) with ESMTPSA id AFF6340217; Thu, 24 Sep 2020 12:51:24 +0000 (UTC) Date: Thu, 24 Sep 2020 15:50:47 +0300 From: Efraim Flashner Message-ID: <20200924125047.GB1473@E5400> References: <20200820150914.9443-1-dannym@scratchpost.org> <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="l76fUT7nc3MelDdI" Content-Disposition: inline In-Reply-To: <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 3.6 (+++) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 2.6 (++) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.69 X-TUID: 0arWTogjY+Rh --l76fUT7nc3MelDdI Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan wrote: > @Danny >=20 > Please find the attached split patches. >=20 > Regards, > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: glib-with-documentation: Make some cosmetic > changes. >=20 > * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. > --- > gnu/packages/glib.scm | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 2cda6cd000..9aebfb7e63 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -292,12 +292,7 @@ threads, dynamic loading, and an object system.") > (package > (inherit glib) > (properties (alist-delete 'hidden? (package-properties glib))) > - (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) > - ("libxml2" ,libxml2) > - ,@(package-native-inputs glib))) > + (outputs (cons "doc" (package-outputs glib))) > (arguments > (substitute-keyword-arguments (package-arguments glib) > ((#:configure-flags flags ''()) > @@ -312,7 +307,12 @@ threads, dynamic loading, and an object system.") > (copy-recursively (string-append out html) > (string-append doc html)) > (delete-file-recursively (string-append out html)) > - #t))))))))) > + #t))))))) > + (native-inputs > + `(("docbook-xml" ,docbook-xml) > + ("gtk-doc" ,gtk-doc) > + ("libxml2" ,libxml2) > + ,@(package-native-inputs glib))))) > =20 > (define gobject-introspection > (package > --=20 > 2.28.0 >=20 > From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:39:00 -0400 > Subject: [PATCH 13/13] gnu: glib-with-documentation: Fix documentation. >=20 > * gnu/packages/glib.scm (glib-with-documentation) [arguments]<#:phases>['= patch-docbook-xml]: New phase. > ['move-doc]: Modify phase. > --- > gnu/packages/glib.scm | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 9aebfb7e63..b15c75a740 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -299,14 +299,28 @@ threads, dynamic loading, and an object system.") > `(cons "-Dgtk_doc=3Dtrue" ,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/.*\\.x= ml" > + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/= =2E*\\.xml") Does that regex actually work? Yes or no, the following is much cleaner: (substitute* (find-files "." "\\.xml$") If it does have to be those directories specifically then I'd go with: (append (find-files "gio/gdbus-object-manager-example" "\\.xml") (find-files "(gio|glib|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)) > + (let* ((out (assoc-ref outputs "out")) > + (doc (assoc-ref outputs "doc")) > + (html (string-append "/share/gtk-doc"))) This doesn't need to be let*, let should do it. Also, html doesn't need string-append, it's not being joined to anything :) > + (mkdir-p (string-append doc "/share")) > + (rename-file > + (string-append out html) > + (string-append doc html)) > #t))))))) > (native-inputs > `(("docbook-xml" ,docbook-xml) > --=20 > 2.28.0 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --l76fUT7nc3MelDdI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl9sliMACgkQQarn3Mo9 g1E2cg//QkzyBttiIYfKTY2gtWgZlaVRNhGM/gWrFkr2856YWM2+9BHDNs3oVRYr TnVha7k2K81m4UatFH63gjp9jdYeoNM6p7b08CYysAGBZnP0SO/3Iljeh5hyAiYp 7YktNjMqzQiZqS3TI6MOka764lEP0HCagnAjHpoQoTdrudbfyv71lrXbpL7RLnFn fqdsR/rOac8tZ+wposkI/xyv0F0BEWNzhR+AHhe9Z+45FXV0eKSU6TiAdV6J9DWD UMt1ZTEm35T6MVCoD2ZvUXYAafq7b1Gg3Zurd7xRg0UQA3CL58M6EICvgBpxMJmz lr8HSbI406aZFwb3Og6vzkCKFvTM+wICZNey+Drjy8fD1o0n6x7A1uhbVJGiICZz dBeW0I3YoEPYpt9NfJrAeuOl+Z1j618BSkR6dcWztuUJiD7TjIXMXHgI1kY6T+QE gGYkzN5/slNfJ1jFNzKFvSBVvEuSuUN7Hl/vPgODVO0BPHqhPG48U2KFLba6mzod 8ifu9FrgoxLfOwqO+jByjzZ2U5DxF/zVrKsAWIefmzHqQXf3pba4cg83w72uyJvF JHkznN+q3KMrhRm+/WzJz8uxBaEmTIKJZDAgF2t4GJzN2WtShA6h5I3/dY8Y83PS L5M33qDmvnCzdfP1A3Zt6zm6GCyaut3rdetLxTkUKa+WCwfOeSA= =15/Y -----END PGP SIGNATURE----- --l76fUT7nc3MelDdI--