GNU bug report logs - #42958
[PATCH core-updates 00/29] Big changes from wip-desktop.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Danny Milosavljevic <dannym@HIDDEN>; Keywords: patch; dated Thu, 20 Aug 2020 15:10:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 29 Nov 2020 12:21:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 29 07:21:17 2020
Received: from localhost ([127.0.0.1]:49948 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kjLhd-0004Qv-6J
	for submit <at> debbugs.gnu.org; Sun, 29 Nov 2020 07:21:17 -0500
Received: from dd26836.kasserver.com ([85.13.145.193]:40648)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kjLhb-0004Qk-Am
 for 42958 <at> debbugs.gnu.org; Sun, 29 Nov 2020 07:21:15 -0500
Received: from localhost (80-110-127-97.cgn.dynamic.surfer.at [80.110.127.97])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C6CFF336578B;
 Sun, 29 Nov 2020 13:21:12 +0100 (CET)
Date: Sun, 29 Nov 2020 13:21:10 +0100
From: Danny Milosavljevic <dannym@HIDDEN>
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update
 package definition.
Message-ID: <20201129132110.644acc27@HIDDEN>
In-Reply-To: <20200924125553.GC1473@E5400>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
 <20200924125553.GC1473@E5400>
X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bjY1rTq=DRrdGFBVAMDtP3J";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org, Efraim Flashner <efraim@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/bjY1rTq=DRrdGFBVAMDtP3J
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Raghav,

could you consider updating the patch to incorporate Efraim's changes,
if desired?

--Sig_/bjY1rTq=DRrdGFBVAMDtP3J
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/DkjYACgkQ5xo1VCww
uqVbVAf9G2kj1oGvqZcPjUgEeyUgJoehVyGUDsaz+0PS9F7n+EbbHy+74m4YBnNY
0m7JHXZQzM/Rt/wV+QmoVx2tFzFKdtVseJ8yNnMQgUcnEwxG1Jl4X46oFOUHCcvw
5dNfCKd4NrV/VZV0yc0r7a8nVUIQ/Ei5DACqGsCHrNSzppDQZPNUZI/lxO8Mg//z
dm3Cdu6qIC9k0GC+uHSp2iG+rSaNOAgP6kQMLIp+jjExUHSxMAjxFB6bn/ykp1QA
I6XFfoX2D0BJHD0FUlhtgYnMsI1Ufyar2M9YwzzFetEY8tMTqCeHJekqDz0wE0EQ
MNuJWbNsV03ZcF010xR5tyDoAHRFzQ==
=iELi
-----END PGP SIGNATURE-----

--Sig_/bjY1rTq=DRrdGFBVAMDtP3J--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 27 Sep 2020 10:12:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 27 06:12:43 2020
Received: from localhost ([127.0.0.1]:48402 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kMTff-0006zq-9g
	for submit <at> debbugs.gnu.org; Sun, 27 Sep 2020 06:12:43 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:44652)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kMTfc-0006zf-EX
 for 42958 <at> debbugs.gnu.org; Sun, 27 Sep 2020 06:12:42 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id BB4B733682CD;
 Sun, 27 Sep 2020 12:12:38 +0200 (CEST)
Date: Sun, 27 Sep 2020 12:12:13 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update
 package definition.
Message-ID: <20200927121213.0b3bed11@HIDDEN>
In-Reply-To: <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Har5qfMqiL_L0shcDiWlTJd";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/Har5qfMqiL_L0shcDiWlTJd
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

What about those failed tests?  Can we fix those?

If not, please add a comment in the embedded patch (where it disables the t=
est)
why the test is disabled.

--Sig_/Har5qfMqiL_L0shcDiWlTJd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9wZX0ACgkQ5xo1VCww
uqUFcwf9GcyyY4bJhj1Yuz8/SnWu+RZys4jZUCtH1c6qnEGMPAQdmfPS/JiVYfwo
+O3u5/Hg3xRCWl3PTa4mbgt9QTWKGSOsZM6XdzABIn/iRMZ7U11Atm6UGWP7nHCs
8WN42w315lvNinWYOknGTY5RHD3AipdsPfpkym4Wea9PlKjI6OiNI32hTqv1WWDQ
QCybAwhwKvd9okkg54nNV6VmUA9xQ0qWdJvwXqEUXMtyeH+Rkytky8jyWgQvyr2u
X6gUQPu2NZqUSbhyO7wf5sXbF4XSX9ARpHZvwZhKAxBfZO2ovOS0f55TRYBzjYjO
5t+Fj48MKm6Bwsc9hZHoHgf+UR1lPw==
=5Y+7
-----END PGP SIGNATURE-----

--Sig_/Har5qfMqiL_L0shcDiWlTJd--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 15:35:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 11:35:18 2020
Received: from localhost ([127.0.0.1]:41361 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLTHC-00085i-Au
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 11:35:18 -0400
Received: from knopi.disroot.org ([178.21.23.139]:60288)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLTH8-00085X-Sz
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 11:35:16 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 50921528CF
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 17:35:13 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id K1qVa_gub_Kr for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 17:35:11 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600961711; bh=Ly1EUP0EsVnfyoiI4oIAoQ8gNfkFZ0np77OsjDiWpsY=;
 h=To:From:Subject:Date;
 b=dGuuO44pf7Pv7Y4uZY+VwDnYEzUArM/Td54fH+qSs+3Efu+M0G/OhFqzgJRtoalPP
 kncWn36RdV2pnUJHwM+1WtpYV00DY6nkxp8R4b7Ni4Ar8lgdIuomFHIMPXFm0jRHgl
 MWKev/4HzuBUmi+b6o5CXVvL+lBms74N4uWVr7nUKsJhlrepU7aBj/20PBrUEeBNiB
 DemiJh8OZbi/wHM3Et6Wdi7MaVNtCrbPa4YmYRiSUlS6NNXNdhD0BHMpmyP2jwCL0o
 tndQVibEJV3qyvf1yh9bpJD3ARSQKDFipsKcI03oWBkLgulObTjSq8ZrM+Ujhd8dVa
 Y0vHnd+wm04BA==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 10/29] gnu: cairo: Update package definition.
Message-ID: <f2afa74c-6cc8-2970-b7ac-98577654f607@HIDDEN>
Date: Thu, 24 Sep 2020 11:35:09 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------AEEA8D00193F1253BBF7698C"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------AEEA8D00193F1253BBF7698C
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------AEEA8D00193F1253BBF7698C
Content-Type: text/x-patch; charset=UTF-8;
 name="0026-gnu-cairo-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
 filename="0026-gnu-cairo-Make-some-cosmetic-changes.patch"

From 4e13823ff058adfed4422b3208ee1547bb7e3cc2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 11:18:50 -0400
Subject: [PATCH 26/30] gnu: cairo: Make some cosmetic changes.

* gnu/packages/gtk.scm (cairo): Make some cosmetic changes.
---
 gnu/packages/gtk.scm | 78 ++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ff8547d00b..ea4ca684bf 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -121,57 +121,57 @@ tools have full access to view and control running applications.")
 
 (define-public cairo
   (package
-   (name "cairo")
-   (version "1.16.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://cairographics.org/releases/cairo-"
-                                version ".tar.xz"))
-            (sha256
-             (base32
-              "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
-   (build-system gnu-build-system)
-   (propagated-inputs
-    `(("fontconfig" ,fontconfig)
-      ("freetype" ,freetype)
-      ("glib" ,glib)
-      ("libpng" ,libpng)
-      ("libx11" ,libx11)
-      ("libxext" ,libxext)
-      ("libxrender" ,libxrender)
-      ("pixman" ,pixman)))
-   (inputs
-    `(("ghostscript" ,ghostscript)
-      ("libspectre" ,libspectre)
-      ("poppler" ,poppler)
-      ("xorgproto" ,xorgproto)
-      ("zlib" ,zlib)))
-   (native-inputs
-     `(("pkg-config" ,pkg-config)
-      ("python" ,python-wrapper)))
+    (name "cairo")
+    (version "1.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://cairographics.org/releases/cairo-"
+                       version ".tar.xz"))
+       (sha256
+        (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
+    (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f  ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
-       #:configure-flags '("--enable-tee"      ;needed for GNU Icecat
-                           "--enable-xml"      ;for cairo-xml support
-                           "--disable-static")))
-   (synopsis "2D graphics library")
-   (description
-    "Cairo is a 2D graphics library with support for multiple output devices.
+     `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+       #:configure-flags
+       (list "--enable-tee"
+             "--enable-xml"
+             "--disable-static")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("ghostscript" ,ghostscript)
+       ("libspectre" ,libspectre)
+       ("poppler" ,poppler)
+       ("xorgproto" ,xorgproto)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("glib" ,glib)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrender" ,libxrender)
+       ("pixman" ,pixman)))
+    (synopsis "2D graphics library")
+    (description
+     "Cairo is a 2D graphics library with support for multiple output devices.
 Currently supported output targets include the X Window System (via both
 Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
 output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
-
 Cairo is designed to produce consistent output on all output media while
 taking advantage of display hardware acceleration when available
 eg. through the X Render Extension).
-
 The cairo API provides operations similar to the drawing operators of
 PostScript and PDF.  Operations in cairo including stroking and filling cubic
 Bézier splines, transforming and compositing translucent images, and
 antialiased text rendering.  All drawing operations can be transformed by any
 affine transformation (scale, rotation, shear, etc.).")
-   (license license:lgpl2.1) ; or Mozilla Public License 1.1
-   (home-page "https://cairographics.org/")))
+    (home-page "https://cairographics.org/")
+    (license license:lgpl2.1)))
 
 (define-public cairo-xcb
   (package
-- 
2.28.0


--------------AEEA8D00193F1253BBF7698C
Content-Type: text/x-patch; charset=UTF-8;
 name="0027-gnu-cairo-Change-build-system.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0027-gnu-cairo-Change-build-system.patch"

From 6639868a35a88667ea103c965d12138bebacb12c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 11:20:07 -0400
Subject: [PATCH 27/30] gnu: cairo: Change build-system.

* gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or-gtk.
---
 gnu/packages/gtk.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ea4ca684bf..fea6695821 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -131,7 +131,7 @@ tools have full access to view and control running applications.")
                        version ".tar.xz"))
        (sha256
         (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:configure-flags
-- 
2.28.0


--------------AEEA8D00193F1253BBF7698C
Content-Type: text/x-patch; charset=UTF-8;
 name="0028-gnu-cairo-Move-documentation-to-separate-output.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0028-gnu-cairo-Move-documentation-to-separate-output.patch"

From 82afad9ea3ca75e07c5c43c77daa7af5ff99e49c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 11:24:36 -0400
Subject: [PATCH 28/30] gnu: cairo: Move documentation to separate output.

* gnu/packages/gtk.scm (cairo) [outputs]: New output "doc".
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
---
 gnu/packages/gtk.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fea6695821..eb76b11e91 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -132,12 +132,17 @@ tools have full access to view and control running applications.")
        (sha256
         (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:configure-flags
-       (list "--enable-tee"
-             "--enable-xml"
-             "--disable-static")))
+       (list
+        "--enable-tee"
+        "--enable-xml"
+        "--disable-static"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)))
-- 
2.28.0


--------------AEEA8D00193F1253BBF7698C
Content-Type: text/x-patch; charset=UTF-8;
 name="0029-gnu-cairo-Enable-some-features.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0029-gnu-cairo-Enable-some-features.patch"

From a3ad002396f7b112bb9117d5c4879bf720c40fd4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 11:27:34 -0400
Subject: [PATCH 29/30] gnu: cairo: Enable some features.

* gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection.
[inputs]: Add libdrm. Remove xorgproto and zlib.
[propagated-inputs]: Add libxcb.
---
 gnu/packages/gtk.scm | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index eb76b11e91..f7184acb23 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -137,30 +137,44 @@ tools have full access to view and control running applications.")
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:configure-flags
        (list
-        "--enable-tee"
-        "--enable-xml"
         "--disable-static"
+        ;; XXX: To be enabled.
+        ;; "--enable-gallium=yes"
+        ;; "--enable-gl=yes"
+        ;; " --enable-glesv2=yes"
+        ;; "--enable-glesv3=yes"
+        ;; "--enable-cogl=yes"
+        ;; "--enable-directfb=yes"
+        ;; "--enable-vg=yes"
+        "--enable-tee=yes"
+        "--enable-xml=yes"
         (string-append "--with-html-dir="
                        (assoc-ref %outputs "doc")
                        "/share/gtk-doc/html"))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)))
     (inputs
-     `(("ghostscript" ,ghostscript)
+     `(("drm" ,libdrm)
+       ("ghostscript" ,ghostscript)
        ("libspectre" ,libspectre)
-       ("poppler" ,poppler)
-       ("xorgproto" ,xorgproto)
-       ("zlib" ,zlib)))
+       ("poppler" ,poppler)))
     (propagated-inputs
-     `(("fontconfig" ,fontconfig)
+     `( ;; ("cogl" ,cogl)
+       ;; ("directfb" ,directfb)
+       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("glib" ,glib)
+       ;; ("gtk+" ,gtk+)
        ("libpng" ,libpng)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxrender" ,libxrender)
-       ("pixman" ,pixman)))
+       ;; ("librsvg" ,librsvg)
+       ;; ("opengl" ,mesa)
+       ("pixman" ,pixman)
+       ("x11" ,libx11)
+       ("xcb" ,libxcb)
+       ("xext" ,libxext)
+       ("xrender" ,libxrender)))
     (synopsis "2D graphics library")
     (description
      "Cairo is a 2D graphics library with support for multiple output devices.
-- 
2.28.0


--------------AEEA8D00193F1253BBF7698C
Content-Type: text/x-patch; charset=UTF-8;
 name="0030-gnu-cairo-Update-synopsis-description-and-license.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
 filename*0="0030-gnu-cairo-Update-synopsis-description-and-license.patch"

From 97ed550e5a5c56184722fc14b8795c9030998cfd Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 11:31:47 -0400
Subject: [PATCH 30/30] gnu: cairo: Update synopsis, description and license.

* gnu/packages/gtk.scm (cairo) [synopsis]: Modify.
[description]: Modify.
[license]: Modify.
---
 gnu/packages/gtk.scm | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f7184acb23..2afd3489d7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -175,22 +175,17 @@ tools have full access to view and control running applications.")
        ("xcb" ,libxcb)
        ("xext" ,libxext)
        ("xrender" ,libxrender)))
-    (synopsis "2D graphics library")
-    (description
-     "Cairo is a 2D graphics library with support for multiple output devices.
-Currently supported output targets include the X Window System (via both
-Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
-output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
-Cairo is designed to produce consistent output on all output media while
-taking advantage of display hardware acceleration when available
-eg. through the X Render Extension).
-The cairo API provides operations similar to the drawing operators of
-PostScript and PDF.  Operations in cairo including stroking and filling cubic
-Bézier splines, transforming and compositing translucent images, and
-antialiased text rendering.  All drawing operations can be transformed by any
-affine transformation (scale, rotation, shear, etc.).")
+    (synopsis "Multi-platform 2D graphics library")
+    (description "Cairo is a 2D graphics library with support for multiple output
+devices.  Currently supported output targets include the X Window System (via
+both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
+output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
     (home-page "https://cairographics.org/")
-    (license license:lgpl2.1)))
+    (license
+     ;; This project is dual-licensed.
+     (list
+      license:lgpl2.1+
+      license:mpl1.1))))
 
 (define-public cairo-xcb
   (package
-- 
2.28.0


--------------AEEA8D00193F1253BBF7698C--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 15:04:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 11:04:04 2020
Received: from localhost ([127.0.0.1]:41245 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLSmx-00056y-An
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 11:04:03 -0400
Received: from knopi.disroot.org ([178.21.23.139]:56004)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLSmt-00056J-GD
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 11:04:01 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 270B55291B
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 17:03:58 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id AgFpDaNqNo3b for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 17:03:56 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600959832; bh=IX71SdYPf7TrSMJZ4/iq1uau7Yb8dWz/ssx95Td/Bag=;
 h=To:From:Subject:Date;
 b=f+alyjYJbF2gA6FOzg7OXpUWuj8ekSc7scvaLJZmf5QyXqm9YolcuejuroSoBpyPv
 CWjNeHVmbWyi8XF8DqP4kHz8YvUe4bMWcbekjlRzKJqNVRkgN25Ly9TynXoMErGMmq
 0OF5jHlhemmKPgiX7/NBOMcbofIEIeoA3skj00/d5eQhAIldErQTwQrDpk2gfF4QBf
 JCwY02/HCtrmD7MquKdN0eJMY4mAZLTDaEEe48BMvo7RirbsfPwT29sdlGYuToPCcb
 L5weUrifqogCp153gaZh6UZVbaT7ZAZy729xhfeGWTEoAHMn/HaeOeKEsQc2IY7ro0
 EhQvAfQBJpBsw==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package
 definition.
Message-ID: <17717f6c-0dc7-4675-4421-16044d772248@HIDDEN>
Date: Thu, 24 Sep 2020 11:03:51 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------5FE83E8820CCEF5CF5DDABF9"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/x-patch; charset=UTF-8;
 name="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch"

From c644a020006d314d27414be5bd901b9774ca53f8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:39:25 -0400
Subject: [PATCH 21/25] gnu: openjpeg: Make some cosmetic changes.

* gnu/packages/images.scm (openjpeg): Make some cosmetic changes.
---
 gnu/packages/image.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ff434bb6c9..e6b5fd6bda 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -807,31 +807,33 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
   (package
     (name "openjpeg")
     (version "2.3.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/uclouvain/openjpeg")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name "openjpeg" version))
-              (sha256
-               (base32
-                "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/uclouvain/openjpeg")
+         (commit
+          (string-append "v" version))))
+       (file-name
+        (git-file-name "openjpeg" version))
+       (sha256
+        (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f                   ;TODO: requires a 1.1 GiB data repository
+     '(#:tests? #f           ;TODO: requires a 1.1 GiB data repository
        #:configure-flags '("-DBUILD_STATIC_LIBS=OFF")))
     (inputs
-      `(("lcms" ,lcms)
-        ("libpng" ,libpng)
-        ("libtiff" ,libtiff)
-        ("zlib" ,zlib)))
+     `(("lcms" ,lcms)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("zlib" ,zlib)))
     (synopsis "JPEG 2000 codec")
     (description
-      "The OpenJPEG library is a JPEG 2000 codec written in C.  It has
+     "The OpenJPEG library is a JPEG 2000 codec written in C.  It has
 been developed in order to promote the use of JPEG 2000, the new
 still-image compression standard from the Joint Photographic Experts
 Group (JPEG).
-
 In addition to the basic codec, various other features are under
 development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats,
 an indexing tool useful for the JPIP protocol, JPWL-tools for
-- 
2.28.0


--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/x-patch; charset=UTF-8;
 name="0022-gnu-openjpeg-Enable-tests.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0022-gnu-openjpeg-Enable-tests.patch"

From 162e90e9df45096a0bd6324ba039da69aa4e0492 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:48:08 -0400
Subject: [PATCH 22/25] gnu: openjpeg: Enable tests.

* gnu/packages/image.scm (openjpeg) [arguments]<#:tests?>: Remove argument.
<#:configure-flags>[-DBUILD_UNIT_TESTS]: New flag.
[-DBUILD_TESTING]: New flag.
[-DOPJ_DATA_ROOT]: New flag.
<#:phases>['disable-failing-tests]: New phase.
[native-inputs]: Add openjpeg-data.
---
 gnu/packages/image.scm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index e6b5fd6bda..2e97f04f8a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -821,8 +821,25 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
         (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f           ;TODO: requires a 1.1 GiB data repository
-       #:configure-flags '("-DBUILD_STATIC_LIBS=OFF")))
+     `(#:configure-flags 
+       (list
+        "-DBUILD_STATIC_LIBS=OFF"
+        "-DBUILD_UNIT_TESTS=ON"
+        "-DBUILD_TESTING=ON"
+        (string-append "-DOPJ_DATA_ROOT="
+                       (assoc-ref %build-inputs "openjpeg-data")))
+       #:phases
+       (modify-phases %standard-phases
+         ;; To be re-enabled after upstream fixes the bug,
+         ;; https://github.com/uclouvain/openjpeg/issues/1264
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/CMakeLists.txt"
+               (("add_subdirectory\\(nonregression\\)")
+                ""))
+             #t)))))
+    (native-inputs
+     `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite
     (inputs
      `(("lcms" ,lcms)
        ("libpng" ,libpng)
-- 
2.28.0


--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/x-patch; charset=UTF-8;
 name="0023-gnu-openjpeg-Enable-documentation.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0023-gnu-openjpeg-Enable-documentation.patch"

From 03e33cb0d15508c5644451345a112c19e18552cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:53:00 -0400
Subject: [PATCH 23/25] gnu: openjpeg: Enable documentation.

* gnu/packages/image.scm (openjpeg) [outputs]: New output "doc".
[arguments]<#:configure-flags>[-DBUILD_DOC]: New flag.
<#:phases>['move-docs]: New phase.
[native-inputs]: Add doxygen.
---
 gnu/packages/image.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 2e97f04f8a..26ed0d7616 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -820,9 +820,11 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
        (sha256
         (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
     (build-system cmake-build-system)
+    (outputs '("out" "doc"))
     (arguments
      `(#:configure-flags 
        (list
+        "-DBUILD_DOC=ON"
         "-DBUILD_STATIC_LIBS=OFF"
         "-DBUILD_UNIT_TESTS=ON"
         "-DBUILD_TESTING=ON"
@@ -837,9 +839,19 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
              (substitute* "tests/CMakeLists.txt"
                (("add_subdirectory\\(nonregression\\)")
                 ""))
-             #t)))))
+             #t))
+         (add-after 'install 'move-docs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share/doc"))
+               (rename-file
+                (string-append out "/share/doc/html")
+                (string-append doc "/share/doc/html"))
+               #t))))))
     (native-inputs
-     `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite
+     `(("doxygen" ,doxygen)
+       ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite
     (inputs
      `(("lcms" ,lcms)
        ("libpng" ,libpng)
-- 
2.28.0


--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/x-patch; charset=UTF-8;
 name="0024-gnu-openjpeg-Enable-some-features.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0024-gnu-openjpeg-Enable-some-features.patch"

From 26bdc80f2da072437e58fe305feb038f8b9c722e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:57:23 -0400
Subject: [PATCH 24/25] gnu: openjpeg: Enable some features.

* gnu/packages/image.scm (openjpeg) <#:configure-flags>[-DBUILD_LUTS_GENERATOR]: New flag.
[-DBUILD_MJ2]: New flag.
[-DBUILD_JPWL]: New flag.
[-DBUILD_JP3D]: New flag.
[native-inputs]: Add python-wrapper.
[inputs]: Add curl and fcgi.
---
 gnu/packages/image.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 26ed0d7616..3c2718bc3b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -826,7 +826,15 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
        (list
         "-DBUILD_DOC=ON"
         "-DBUILD_STATIC_LIBS=OFF"
+        "-DBUILD_LUTS_GENERATOR=ON"
         "-DBUILD_UNIT_TESTS=ON"
+        "-DBUILD_MJ2=ON"
+        "-DBUILD_JPWL=ON"
+        ;; To be enabled after Java becomes reproducible.
+        ;; "-DBUILD_JPIP=ON"
+        ;; "-DBUILD_JPIP_SERVER=ON"
+        ;; "-DBUILD_JAVA=ON"
+        "-DBUILD_JP3D=ON"
         "-DBUILD_TESTING=ON"
         (string-append "-DOPJ_DATA_ROOT="
                        (assoc-ref %build-inputs "openjpeg-data")))
@@ -851,9 +859,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
                #t))))))
     (native-inputs
      `(("doxygen" ,doxygen)
-       ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite
+       ("openjpeg-data" ,openjpeg-data) ; Files for test-suite
+       ("python" ,python-wrapper)))
     (inputs
-     `(("lcms" ,lcms)
+     `(("curl" ,curl)
+       ("fcgi" ,fcgi)
+       ("lcms" ,lcms)
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)
        ("zlib" ,zlib)))
-- 
2.28.0


--------------5FE83E8820CCEF5CF5DDABF9
Content-Type: text/x-patch; charset=UTF-8;
 name="0025-gnu-openjpeg-Update-synopsis-and-description.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0025-gnu-openjpeg-Update-synopsis-and-description.patch"

From c48f3fa4344b5ee13b1fc2ca873587e4a9a46a6a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:59:47 -0400
Subject: [PATCH 25/25] gnu: openjpeg: Update synopsis and description.

* gnu/packages/image.scm (openjpeg) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/image.scm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3c2718bc3b..7a03cdcd46 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -868,16 +868,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)
        ("zlib" ,zlib)))
-    (synopsis "JPEG 2000 codec")
-    (description
-     "The OpenJPEG library is a JPEG 2000 codec written in C.  It has
-been developed in order to promote the use of JPEG 2000, the new
-still-image compression standard from the Joint Photographic Experts
-Group (JPEG).
-In addition to the basic codec, various other features are under
-development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats,
-an indexing tool useful for the JPIP protocol, JPWL-tools for
-error-resilience, a Java-viewer for j2k-images, ...")
+    (synopsis "OPENJPEG Library and Applications")
+    (description "OpenJPEG is an implementation of JPEG 2000 codec written in C
+language.  It has been developed in order to promote the use of JPEG 2000, a
+still-image compression standard from the Joint Photographic Experts Group
+(JPEG).  Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a
+JPEG 2000 Reference Software.")
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 
-- 
2.28.0


--------------5FE83E8820CCEF5CF5DDABF9--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 14:34:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 10:34:10 2020
Received: from localhost ([127.0.0.1]:41173 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLSK1-0002ER-Sc
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 10:34:10 -0400
Received: from knopi.disroot.org ([178.21.23.139]:44642)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLSJy-0002EG-HN
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 10:34:08 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 90ABA51C22
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 16:34:04 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id pI2WrxVZpA3O for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 16:34:01 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600958041; bh=qxO+0DB/nrsuLnTOryD7dP1Znr7AMkQBE3ItII62ERk=;
 h=To:From:Subject:Date;
 b=iIwfxFvZYKLmvJu6efk/5gqiWO3jJE5gwtAAef/e9nO4pr03PJq1WnwBzTRNojCpA
 Jktp0XveutINGcT3C3ZU0Kc0mrr7onAKNpWvHfVZXvtyYn6wGlNUC19VV6poxIE/Gu
 hWG7O8zf/wzFDbUP45pAVFCGioVREqmSBx7SyQAXvV0VbjlMJIrXqcFDjDcjJ2kTre
 V7uMyp+0BnD27zD4ectPVgAJ02azMcycDS4z710uHlQNd0A0zKE8i3XV5RF7ZSzKgF
 /xnR2OornAWx7icMaUInJKwN4ZRlWHxT5ra+W5vwH2KOkCpcRYVsAd1Ah9mWY4Vzvh
 KAswGZVWbpImg==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 08/29] gnu: pixman: Update package definition.
Message-ID: <c0f12697-b0c7-71c7-e12c-9d114f9349ff@HIDDEN>
Date: Thu, 24 Sep 2020 10:33:59 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------EA6001687AE95B0B3B513402"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------EA6001687AE95B0B3B513402
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------EA6001687AE95B0B3B513402
Content-Type: text/x-patch; charset=UTF-8;
 name="0017-gnu-pixman-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0017-gnu-pixman-Make-some-cosmetic-changes.patch"

From 4d2b26892bcb2be8aaea78e860ed64a06dc533d6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:25:06 -0400
Subject: [PATCH 17/20] gnu: pixman: Make some cosmetic changes.

* gnu/packages/xdisorg.org (pixman): Make some cosmetic changes.
---
 gnu/packages/xdisorg.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 44f903ccb0..fdb92f9b4c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -471,28 +471,31 @@ following the mouse.")
   (package
     (name "pixman")
     (version "0.38.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.cairographics.org/releases/pixman-"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns"))
-              (patches (search-patches "pixman-CVE-2016-5296.patch"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://www.cairographics.org/releases/pixman-"
+         version ".tar.gz"))
+       (sha256
+        (base32 "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns"))
+       (patches
+        (search-patches
+         "pixman-CVE-2016-5296.patch"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--disable-static")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("libpng" ,libpng)
        ("zlib" ,zlib)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://www.pixman.org/")
     (synopsis "Low-level pixel manipulation library")
     (description "Pixman is a low-level software library for pixel
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
+    (home-page "http://www.pixman.org/")
     (license license:x11)))
 
 (define-public libdrm
-- 
2.28.0


--------------EA6001687AE95B0B3B513402
Content-Type: text/x-patch; charset=UTF-8;
 name="0018-gnu-pixman-Update-to-0.40.0.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0018-gnu-pixman-Update-to-0.40.0.patch"

From 0cbf6f42497baca4e799199362ff0fdfed908d95 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:26:59 -0400
Subject: [PATCH 18/20] gnu: pixman: Update to 0.40.0.

* gnu/packages/xdisorg.scm (pixman) [version]: Update to 0.40.0.
[source]<origin>[sha256]: Modify base32.
[license]: Change from X11 to expat.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index fdb92f9b4c..337c787ad0 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -470,7 +470,7 @@ following the mouse.")
 (define-public pixman
   (package
     (name "pixman")
-    (version "0.38.4")
+    (version "0.40.0")
     (source
      (origin
        (method url-fetch)
@@ -496,7 +496,7 @@ following the mouse.")
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
     (home-page "http://www.pixman.org/")
-    (license license:x11)))
+    (license license:expat)))
 
 (define-public libdrm
   (package
-- 
2.28.0


--------------EA6001687AE95B0B3B513402
Content-Type: text/x-patch; charset=UTF-8;
 name="0019-gnu-pixman-Enable-some-features.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0019-gnu-pixman-Enable-some-features.patch"

From 71095ce9261ebfbe90fcfaf22d5e24b54a9ec758 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:29:13 -0400
Subject: [PATCH 19/20] gnu: pixman: Enable some features.

* gnu/packages/xdisorg.scm (pixman) [arguments]<#:configure-flags>[--enable-timers]: New flag.
[--enable-gnuplot]: New flag.
---
 gnu/packages/xdisorg.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 337c787ad0..2dc999d19a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -484,19 +484,22 @@ following the mouse.")
         (search-patches
          "pixman-CVE-2016-5296.patch"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--disable-static")))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("libpng" ,libpng)
-       ("zlib" ,zlib)))
-    (synopsis "Low-level pixel manipulation library")
-    (description "Pixman is a low-level software library for pixel
+    `(#:configure-flags
+      (list
+       "--disable-static"
+       "--enable-timers"
+       "--enable-gnuplot")))
+  (native-inputs
+   `(("pkg-config" ,pkg-config)))
+  (inputs
+   `(("libpng" ,libpng)
+     ("zlib" ,zlib)))
+  (synopsis "Low-level pixel manipulation library")
+  (description "Pixman is a low-level software library for pixel
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
-    (home-page "http://www.pixman.org/")
-    (license license:expat)))
+  (home-page "http://www.pixman.org/")
+  (license license:expat)))
 
 (define-public libdrm
   (package
-- 
2.28.0


--------------EA6001687AE95B0B3B513402
Content-Type: text/x-patch; charset=UTF-8;
 name="0020-gnu-pixman-Update-synopsis-and-description.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0020-gnu-pixman-Update-synopsis-and-description.patch"

From e6064f2f4bb116b893869d8813548b87f77bec95 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 10:31:34 -0400
Subject: [PATCH 20/20] gnu: pixman: Update synopsis and description.

* gnu/packages/xdisorg.scm (pixman) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/xdisorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2dc999d19a..09bd4428bf 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -494,10 +494,9 @@ following the mouse.")
   (inputs
    `(("libpng" ,libpng)
      ("zlib" ,zlib)))
-  (synopsis "Low-level pixel manipulation library")
-  (description "Pixman is a low-level software library for pixel
-manipulation, providing features such as image compositing and trapezoid
-rasterisation.")
+  (synopsis "Image processing and manipulation library")
+  (description "Pixman is a library that provides low-level pixel manipulation
+features such as image compositing and trapezoid rasterization.")
   (home-page "http://www.pixman.org/")
   (license license:expat)))
 
-- 
2.28.0


--------------EA6001687AE95B0B3B513402--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 14:17:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 10:17:32 2020
Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLS3w-0001n2-0M
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 10:17:32 -0400
Received: from knopi.disroot.org ([178.21.23.139]:43252)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLS3u-0001ms-CA
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 10:17:31 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 83BB651CA7;
 Thu, 24 Sep 2020 16:17:28 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id A51mE9hDUPl4; Thu, 24 Sep 2020 16:17:27 +0200 (CEST)
Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu:
 gobject-introspection: Update package, definition.
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600957045; bh=XFV0CRCOC4onphBFpUEz+wlg4vxvBWND5e/uVdnlNdg=;
 h=Subject:To:Cc:References:From:Date:In-Reply-To;
 b=WfgZd9AHgyHMS+UwicivHF4bg0yHOO2XZ4Tbr7R0Z6LdL3Lam41331vmisf8N8oK7
 nXRlWDuPZm47jkisS1cI4SaWho4z9ZIHBmnWKrEuGbbqXcTB/iS2DY3DigBOMnSG7M
 y7868A3az8AWOTcwH7HVSHbE1D5JEFDe4ai5KViC37hjlQbOLB9UF6nOEAWBVjCff6
 G6G3rXmGVOHp4HsZguem568v0zB976o2AQ69goPoIZeSgURgsCQmt9xz3sT+k4p5gG
 CY6yvaEKZeqBDkC3D2qeRxfVsem4pRFndQ3qJE7B84elfHfbWtmygDU14src+90HiD
 2PWd5sfYOO8qg==
To: Danny Milosavljevic <dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
 <20200924155252.1888885f@HIDDEN>
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <3448eb22-e974-d264-30c4-50353a202a93@HIDDEN>
Date: Thu, 24 Sep 2020 10:17:24 -0400
Mime-Version: 1.0
In-Reply-To: <20200924155252.1888885f@HIDDEN>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Danny!

>> -;; In practice, GIR users will need libffi when using
>> -;; gobject-introspection.
> 
> Why was this comment removed?  Is it not true anymore?

The libffi is required to use gobject-introspection. I thought separate 
comment is not needed to say that something is a dependency or 
requirement, as it is trivial to presume so. :-)

>> -    ; Some bits are distributed under the LGPL2+, others under the GPL2+
> 
> Why was this comment removed?  Is it now under GPL2+ entirely?

The next patch updates the license field.

> For patch 15, was zlib always unnecessary?
> Or has upstream removed functionality?
> Or do we remove functionality?

Upstream removed zlib as a dependency.

> Otherwise looks good.

Thanks!

Regards,
RG.




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:53:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 09:53:20 2020
Received: from localhost ([127.0.0.1]:39060 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLRgW-0000fP-Nz
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:53:20 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:40412)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kLRgU-0000fF-ER
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:53:18 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 4DA673368196;
 Thu, 24 Sep 2020 15:53:16 +0200 (CEST)
Date: Thu, 24 Sep 2020 15:52:52 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu:
 gobject-introspection: Update package, definition.
Message-ID: <20200924155252.1888885f@HIDDEN>
In-Reply-To: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/FliGXwGpJBoaRFAh/qHU/y2";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/FliGXwGpJBoaRFAh/qHU/y2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi,

for Patch 14 in your attachment,

>-;; In practice, GIR users will need libffi when using
>-;; gobject-introspection.

Why was this comment removed?  Is it not true anymore?

>-    ; Some bits are distributed under the LGPL2+, others under the GPL2+

Why was this comment removed?  Is it now under GPL2+ entirely?

For patch 15, was zlib always unnecessary?
Or has upstream removed functionality?
Or do we remove functionality?

Otherwise looks good.

Heads-up to everyone: If this patchset is reviewed, it will go to MASTER, as
was discussed here in this thread.  Btw: It has over 6000 dependents.

--Sig_/FliGXwGpJBoaRFAh/qHU/y2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9spLQACgkQ5xo1VCww
uqUgFAf+J+q8/kVsUfl38aLx2EzqtjkGQTDgigOmBJhru+Y/mNQhJooxmU4R9fzD
CioAZ8pkT8wZmtr1OmCcTVaYvR3xYZ+VbgrYKTTrCQX6NURTtgv3xfQAI38TMZyt
B2F7vCG4p9V2v7/KnwGo9tnXIWfhps8I/mcmV1BZdODekIcylLwBQxVhAfp7O27U
iIUrK8BaMtl0g2syXmvh+WxNSHII9rI2dgpivJYQJQdg1NvXqOOqyD3jQv6zKvyj
GRHQtWMimmk/9rhny6k4FQI0wCXNm/pPBADYDwRLs7CW1HiQt0uTgwY17l/nhVA4
7DKTyPsheFT4zalSePRbVU5F/usdsw==
=GkoN
-----END PGP SIGNATURE-----

--Sig_/FliGXwGpJBoaRFAh/qHU/y2--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:33:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 09:33:57 2020
Received: from localhost ([127.0.0.1]:38983 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLRNl-0000A6-2g
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:33:57 -0400
Received: from knopi.disroot.org ([178.21.23.139]:36116)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLRNj-00009w-Nq
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:33:56 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 01DB151BDA
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 15:33:55 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id PlRvWtOOD0n6 for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 15:33:53 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600954433; bh=EljvWy8gJnz/er2Kg6ToiMNFKgjdoGeqCVWs/g9tPoo=;
 h=To:From:Subject:Date;
 b=I/suHoQvUDPNzgrxIu+cds0G2sPUNLXSXm9CeABzc7nNK3g6L1luhgC5sYvxZh+Kk
 b4iWkRbDD0igk+CWJ0js2fiHC8IU89i2T+ZsBtzo3W0OG2PaqsgetOySrRQ98Kzc6J
 kVPamrcvR8UFMezeaNjfvHNWMbXTALCzWYeyql/tiBQ+zenIAhcmBk75fKdG5EUL7u
 AEbxKFLDvD85FKGAE5/bt9KxIKzK1ArhOet6NqNFhB2ay6sb3OF3FQ1S5x8GhGg9o3
 EJGpoLZIsMHzOC2H35GD3Edxr9xMOmvMEBArPnimqscdi0uQBr866L1YbETW7HYzAa
 SFt+o1MKYvPuA==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 07/29] gnu: gobject-introspection: Add
 patches, back.
Message-ID: <8fe01c0a-01e0-c2df-9ea4-14c8c2b5bb4b@HIDDEN>
Date: Thu, 24 Sep 2020 09:33:52 -0400
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

@Danny

This patch is no longer required, as the change has been made in the 
patch 05/29.

Regards,
RG.




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:32:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 09:32:44 2020
Received: from localhost ([127.0.0.1]:38978 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLRMZ-00008G-Gq
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:32:43 -0400
Received: from knopi.disroot.org ([178.21.23.139]:57490)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLRMV-000085-75
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:32:42 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 8350E51C08
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 15:32:37 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with UTF8SMTP id euQYQ9ZWwczT for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 15:32:35 +0200 (CEST)
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package, definition.
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600954350; bh=CUrJ1M5wAwiZq/4LjiARZRWh6IYWXgv37Isxay9eog8=;
 h=Subject:From:To:References:Date:In-Reply-To;
 b=Ccvw/5psNQpKXXesMcQkFvTCmIRNyJ+I9fjQLjx+3xQKJChwZUMTNUp1mdIFh/65T
 G3weB1p4ylejQXweQAI+oCtNaCJtAgs9hlDqK9wvq6qu8Kwb+EngZ31rwUsXbfFT2D
 4cxCTKki4H6NxNyf7J54RXlFX9HLpi4EHgxcuJl0EfBdM1dJSBwn9JobI7hSjs0E/9
 spAfwYm/S02O4C3SqbfodQFhFrV3eRLTlGkwNDM70w62rkULR/HBIkO9F6ruEoKFWv
 TyVvofVieEASoh7cp/c+R/v6ydrHUCi6lkqkwYoSfB6OTDdSNWxDOFn3bktAe0a42j
 ERG60GUYV9o5A==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
To: 42958 <at> debbugs.gnu.org
References: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
Message-ID: <c7db453d-845f-df22-2bde-ba87e9b622f7@HIDDEN>
Date: Thu, 24 Sep 2020 09:32:28 -0400
Mime-Version: 1.0
In-Reply-To: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
Content-Type: multipart/mixed; boundary="------------0DFAC8C7B8AAC0F6CEAB8657"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------0DFAC8C7B8AAC0F6CEAB8657
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached revised split patches.

Regards,
RG.

--------------0DFAC8C7B8AAC0F6CEAB8657
Content-Type: text/x-patch; charset=UTF-8;
 name="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.pa";
 filename*1="tch"

From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 08:58:26 -0400
Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes.

* gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes.
---
 gnu/packages/glib.scm | 45 ++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b15c75a740..549145e799 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.")
   (package
     (name "gobject-introspection")
     (version "1.62.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnome/sources/"
-                   "gobject-introspection/" (version-major+minor version)
-                   "/gobject-introspection-" version ".tar.xz"))
-             (sha256
-              (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
-             (patches (search-patches
-                       "gobject-introspection-cc.patch"
-                       "gobject-introspection-girepository.patch"
-                       "gobject-introspection-absolute-shlib-path.patch"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       "gobject-introspection/" (version-major+minor version)
+                       "/gobject-introspection-" version ".tar.xz"))
+       (sha256
+        (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
+       (patches
+        (search-patches
+         "gobject-introspection-cc.patch"
+         "gobject-introspection-girepository.patch"
+         "gobject-introspection-absolute-shlib-path.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.")
                (("#!@PYTHON_CMD@")
                 (string-append "#!" (which "python3"))))
              #t)))))
+    (native-inputs
+     `(("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("bison" ,bison)
        ("flex" ,flex)
        ("glib" ,glib)
        ("python" ,python-wrapper)
        ("zlib" ,zlib)))
-    (native-inputs
-     `(("glib" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(;; In practice, GIR users will need libffi when using
-       ;; gobject-introspection.
-       ("libffi" ,libffi)))
+     `(("libffi" ,libffi)))
     (native-search-paths
-     (list (search-path-specification
-            (variable "GI_TYPELIB_PATH")
-            (files '("lib/girepository-1.0")))))
+     (list
+      (search-path-specification
+       (variable "GI_TYPELIB_PATH")
+       (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
-    (home-page "https://wiki.gnome.org/GObjectIntrospection")
     (synopsis "Generate interface introspection data for GObject libraries")
     (description
      "GObject introspection is a middleware layer between C libraries (using
@@ -379,7 +380,7 @@ GObject) and language bindings.  The C library can be scanned at compile time
 and generate a metadata file, in addition to the actual native C library.  Then
 at runtime, language bindings can read this metadata and automatically provide
 bindings to call into the C library.")
-    ; Some bits are distributed under the LGPL2+, others under the GPL2+
+    (home-page "https://wiki.gnome.org/GObjectIntrospection")
     (license license:gpl2+)))
 
 (define intltool
-- 
2.28.0


--------------0DFAC8C7B8AAC0F6CEAB8657
Content-Type: text/x-patch; charset=UTF-8;
 name="0015-gnu-gobject-introspection-Update-to-1.64.1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0015-gnu-gobject-introspection-Update-to-1.64.1.patch"

From d3fe71f442d71dc4e4ee1479a62043e86d8e2084 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 09:27:48 -0400
Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1.

* gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1.
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>: Remove all phases.
[native-inputs]: Add bison and flex.
[inputs]: Remove bison, flex, glib and zlib.
[propagated-inputs]: Add glib.
---
 gnu/packages/glib.scm | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 549145e799..cda8a97d5f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.")
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.62.0")
+    (version "1.64.1")
     (source
      (origin
        (method url-fetch)
@@ -340,7 +340,7 @@ threads, dynamic loading, and an object system.")
                        "gobject-introspection/" (version-major+minor version)
                        "/gobject-introspection-" version ".tar.xz"))
        (sha256
-        (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
+        (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))
        (patches
         (search-patches
          "gobject-introspection-cc.patch"
@@ -348,25 +348,17 @@ threads, dynamic loading, and an object system.")
          "gobject-introspection-absolute-shlib-path.patch"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'do-not-use-/usr/bin/env
-           (lambda _
-             (substitute* "tools/g-ir-tool-template.in"
-               (("#!@PYTHON_CMD@")
-                (string-append "#!" (which "python3"))))
-             #t)))))
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("glib" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
-    (inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-       ("glib" ,glib)
-       ("python" ,python-wrapper)
-       ("zlib" ,zlib)))
+       ("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("python" ,python-wrapper)))
     (propagated-inputs
-     `(("libffi" ,libffi)))
+     `(("glib" ,glib)
+       ("libffi" ,libffi)))
     (native-search-paths
      (list
       (search-path-specification
-- 
2.28.0


--------------0DFAC8C7B8AAC0F6CEAB8657
Content-Type: text/x-patch; charset=UTF-8;
 name="0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0016-gnu-gobject-introspection-Update-synopsis-descriptio.pa";
 filename*1="tch"

From a6268885731b9e66e834cd241e52920690196e73 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 09:30:21 -0400
Subject: [PATCH 16/16] gnu: gobject-introspection: Update synopsis,
 description, home-page and license.

* gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
---
 gnu/packages/glib.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index cda8a97d5f..f7a3a866bf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -365,15 +365,19 @@ threads, dynamic loading, and an object system.")
        (variable "GI_TYPELIB_PATH")
        (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
-    (synopsis "Generate interface introspection data for GObject libraries")
-    (description
-     "GObject introspection is a middleware layer between C libraries (using
-GObject) and language bindings.  The C library can be scanned at compile time
-and generate a metadata file, in addition to the actual native C library.  Then
-at runtime, language bindings can read this metadata and automatically provide
-bindings to call into the C library.")
-    (home-page "https://wiki.gnome.org/GObjectIntrospection")
-    (license license:gpl2+)))
+    (synopsis "GObject introspection tools and libraries")
+    (description "GObject introspection is a middleware layer between
+C libraries (using GObject) and language bindings.  The C library can be scanned
+at compile time and generate metadata files, in addition to the actual native
+C library.  Then language bindings can read this metadata and automatically
+provide bindings to call into the C library.")
+    (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection")
+    (license
+     (list
+      ;; For library.
+      license:lgpl2.0+
+      ;; For tools.
+      license:gpl2+))))
 
 (define intltool
   (package
-- 
2.28.0


--------------0DFAC8C7B8AAC0F6CEAB8657--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:20:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 09:20:30 2020
Received: from localhost ([127.0.0.1]:38972 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLRAk-0008IN-Dw
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:20:30 -0400
Received: from knopi.disroot.org ([178.21.23.139]:58202)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLRAi-0008IE-Hl
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:20:29 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 3FDEE4F728
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 15:20:27 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id Uy-48Ap_n6_c for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 15:20:26 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600953610; bh=hS09jbWZ3NPSeS9VMZkZ21DIzvO0Z/LLBmNsbP/m+3A=;
 h=To:From:Subject:Date;
 b=BsV3FbePosF7UTQ7ay1s8qT5RZxS0OS39PUZuHnd1iQi78rpexO787ltFV8bp49Ot
 NasRYBItKRXd8MTxrU4QKtFp/AEIrVGSRKOy9HW4QkgCszLGjqerhqTDxzsDRHQ8Dg
 HFngoxAMLCOt2jVmwCsEXCtOTtOB8vFP9uBhNTQ1TaIHUZSfGr/dJ3qSqGjuj7J6VR
 lx6bUpFNR5tw6TJTzaiy6uiN+oY+JXP+8a6SmOYtlNHkPpwjWw6e7GBBUf4eNlqJl+
 qDQIAkrT4sddPWjSzMvPKn/SZ/t7h02YlvHU3zI7QYdj28HpJg2BQCKASBVbjt0mw6
 rsQ+tfBBec/kQ==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate
 glib.
Message-ID: <a001a4a2-fe05-57bc-ee92-f78a70f19d47@HIDDEN>
Date: Thu, 24 Sep 2020 09:20:09 -0400
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

@Danny

This patch is no longer required, as the change has been made to the 
patch 05/29.

Regards,
RG.




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:15:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 09:15:19 2020
Received: from localhost ([127.0.0.1]:38963 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLR5b-0008A6-HG
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:15:19 -0400
Received: from knopi.disroot.org ([178.21.23.139]:54692)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLR5W-00089s-8n
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 09:15:10 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id A68F251B1C
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 15:15:04 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id sD06BmE8sOFP for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 15:15:02 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600953302; bh=rdVWDBjOz7hXVzpeMJhB7tSPt4I9lVCiw5oosSv1FUA=;
 h=To:From:Subject:Date;
 b=JplHxhQ/CmlT3R5u09ZiBXRZoBQhtZyg4Mxrqj8pSJ3UGBDSJnPeV/pTWKJB+5HTr
 5nsu/wk81nBgMkKKRzlDl6aGKbb4FcVrrhmH828PBlgl1syxrQ8j7fOqxlp/W5hunb
 HBrDIFwLauGD2CB1PbAKNA8hwHzSG8WmpvG+pdJiEE6c6TOlkFdKN4doz3xhzsdgzb
 NmNKlxKKc8PRSpsRuatWHWyIWlZz+3DQKeH8AwPtl9gqMnCWKxXt5Kd3LcVdrkYsIH
 /2VJBcDOgunXuVXGllaKCeY8V4q2IFnFLK2QHijeUqNoPBGf92Go6CkJ/zfjnxrRM3
 +8s6sD21u6XFQ==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package, definition.
Message-ID: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@HIDDEN>
Date: Thu, 24 Sep 2020 09:14:58 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------F97D5CBB1D1645C714E251B1"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------F97D5CBB1D1645C714E251B1
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------F97D5CBB1D1645C714E251B1
Content-Type: text/x-patch; charset=UTF-8;
 name="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.pa";
 filename*1="tch"

From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 08:58:26 -0400
Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes.

* gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes.
---
 gnu/packages/glib.scm | 45 ++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b15c75a740..549145e799 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.")
   (package
     (name "gobject-introspection")
     (version "1.62.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnome/sources/"
-                   "gobject-introspection/" (version-major+minor version)
-                   "/gobject-introspection-" version ".tar.xz"))
-             (sha256
-              (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
-             (patches (search-patches
-                       "gobject-introspection-cc.patch"
-                       "gobject-introspection-girepository.patch"
-                       "gobject-introspection-absolute-shlib-path.patch"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       "gobject-introspection/" (version-major+minor version)
+                       "/gobject-introspection-" version ".tar.xz"))
+       (sha256
+        (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
+       (patches
+        (search-patches
+         "gobject-introspection-cc.patch"
+         "gobject-introspection-girepository.patch"
+         "gobject-introspection-absolute-shlib-path.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.")
                (("#!@PYTHON_CMD@")
                 (string-append "#!" (which "python3"))))
              #t)))))
+    (native-inputs
+     `(("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("bison" ,bison)
        ("flex" ,flex)
        ("glib" ,glib)
        ("python" ,python-wrapper)
        ("zlib" ,zlib)))
-    (native-inputs
-     `(("glib" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(;; In practice, GIR users will need libffi when using
-       ;; gobject-introspection.
-       ("libffi" ,libffi)))
+     `(("libffi" ,libffi)))
     (native-search-paths
-     (list (search-path-specification
-            (variable "GI_TYPELIB_PATH")
-            (files '("lib/girepository-1.0")))))
+     (list
+      (search-path-specification
+       (variable "GI_TYPELIB_PATH")
+       (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
-    (home-page "https://wiki.gnome.org/GObjectIntrospection")
     (synopsis "Generate interface introspection data for GObject libraries")
     (description
      "GObject introspection is a middleware layer between C libraries (using
@@ -379,7 +380,7 @@ GObject) and language bindings.  The C library can be scanned at compile time
 and generate a metadata file, in addition to the actual native C library.  Then
 at runtime, language bindings can read this metadata and automatically provide
 bindings to call into the C library.")
-    ; Some bits are distributed under the LGPL2+, others under the GPL2+
+    (home-page "https://wiki.gnome.org/GObjectIntrospection")
     (license license:gpl2+)))
 
 (define intltool
-- 
2.28.0


--------------F97D5CBB1D1645C714E251B1
Content-Type: text/x-patch; charset=UTF-8;
 name="0015-gnu-gobject-introspection-Update-to-1.64.1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0015-gnu-gobject-introspection-Update-to-1.64.1.patch"

From 387b7bcdbcbdd873a9352f4f36d56296133d9861 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 09:06:12 -0400
Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1.

* gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1.
[source]<origin>[sha256]: Modify base32.
[patches]: Remove gobject-introspection-absolute-shlib-path.patch
and gobject-introspection-cc.patch.
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['do-not-use-/usr/bin/env]: Remove phase.
[native-inputs]: Add bison and flex.
[inputs]: Remove bison, flex and zlib.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Delete file.
* gnu/packages/patches/gobject-introspection-cc.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
 gnu/local.mk                                  |   2 -
 gnu/packages/glib.scm                         |  30 ++--
 ...ct-introspection-absolute-shlib-path.patch | 166 ------------------
 .../patches/gobject-introspection-cc.patch    |  14 --
 4 files changed, 10 insertions(+), 202 deletions(-)
 delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
 delete mode 100644 gnu/packages/patches/gobject-introspection-cc.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2fc47ca2ec..ae2064b5fa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1075,8 +1075,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
   %D%/packages/patches/gnutls-cross.patch			\
-  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
-  %D%/packages/patches/gobject-introspection-cc.patch		\
   %D%/packages/patches/gobject-introspection-girepository.patch	\
   %D%/packages/patches/go-skip-gc-test.patch			\
   %D%/packages/patches/gpm-glibc-2.26.patch			\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 549145e799..fa43bc06a8 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.")
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.62.0")
+    (version "1.64.1")
     (source
      (origin
        (method url-fetch)
@@ -340,33 +340,23 @@ threads, dynamic loading, and an object system.")
                        "gobject-introspection/" (version-major+minor version)
                        "/gobject-introspection-" version ".tar.xz"))
        (sha256
-        (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
+        (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))
        (patches
         (search-patches
-         "gobject-introspection-cc.patch"
-         "gobject-introspection-girepository.patch"
-         "gobject-introspection-absolute-shlib-path.patch"))))
+         "gobject-introspection-girepository.patch"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'do-not-use-/usr/bin/env
-           (lambda _
-             (substitute* "tools/g-ir-tool-template.in"
-               (("#!@PYTHON_CMD@")
-                (string-append "#!" (which "python3"))))
-             #t)))))
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("glib" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
-    (inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-       ("glib" ,glib)
-       ("python" ,python-wrapper)
-       ("zlib" ,zlib)))
+       ("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("python" ,python-wrapper)))
     (propagated-inputs
-     `(("libffi" ,libffi)))
+     `(("glib" ,glib)
+       ("libffi" ,libffi)))
     (native-search-paths
      (list
       (search-path-specification
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
deleted file mode 100644
index 956fa617c3..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-# Names of libraries included in typelib files are opened by dlopen.  Here we 
-# add the full path.
-#
-# This patch was provided by Luca Bruno <lucabru@HIDDEN>  for 
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
---- a/giscanner/scannermain.py
-+++ b/giscanner/scannermain.py
-@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
-     return group
- 
- 
-+def _get_default_fallback_libpath():
-+    # Newer multiple-output-optimized stdenv has an environment variable
-+    # $outputLib which in turn specifies another variable which then is used as
-+    # the destination for the library contents (${!outputLib}/lib).
-+    store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
-+    if store_path is None:
-+        outputs = os.environ.get("outputs", "out").split()
-+        if "lib" in outputs:
-+            # For multiple output derivations let's try whether there is a $lib
-+            # environment variable and use that as the base store path.
-+            store_path = os.environ.get("lib")
-+        elif "out" in outputs:
-+            # Otherwise we have a single output derivation, so the libraries
-+            # most certainly will end up in "$out/lib".
-+            store_path = os.environ.get("out")
-+
-+    if store_path is not None:
-+        # Even if we have a $lib as output, there still should be a $lib/lib
-+        # directory.
-+        return os.path.join(store_path, 'lib')
-+    else:
-+        # If we haven't found a possible scenario, let's return an empty string
-+        # so that the shared library won't be prepended with a path.
-+        #
-+        # Note that this doesn't mean that all hope is lost, because after all
-+        # we can still use --fallback-library-path to set one.
-+        #
-+        # Also, we're not returning None, because that would make it very
-+        # difficult to disable adding fallback paths altogether using something
-+        # like: --fallback-library-path=""
-+        return ""
-+
-+
- def _get_option_parser():
-     parser = optparse.OptionParser('%prog [options] sources',
-                                    version='%prog ' + giscanner.__version__)
-@@ -205,6 +238,10 @@ match the namespace prefix.""")
-     parser.add_option("", "--filelist",
-                       action="store", dest="filelist", default=[],
-                       help="file containing headers and sources to be scanned")
-+    parser.add_option("", "--fallback-library-path",
-+                      action="store", dest="fallback_libpath",
-+                      default=_get_default_fallback_libpath(),
-+                      help="Path to prepend to unknown shared libraries")
- 
-     group = get_preprocessor_option_group(parser)
-     parser.add_option_group(group)
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
-     $""" % re.escape(library_name), re.VERBOSE)
- 
- 
-+def _ldd_library_guix_pattern(library_name):
-+    store_dir = re.escape(
-+      os.environ.get("NIX_STORE", default="/gnu/store")
-+    )
-+    pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
-+    return re.compile(pattern % (store_dir, re.escape(library_name)))
-+
-+
- # This is a what we do for non-la files. We assume that we are on an
- # ELF-like system where ldd exists and the soname extracted with ldd is
- # a filename that can be opened with dlopen().
-@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
-             output = output.decode("utf-8", "replace")
- 
-         shlibs = resolve_from_ldd_output(libraries, output)
--        return list(map(sanitize_shlib_path, shlibs))
-+        fallback_libpath = options.fallback_libpath or "";
-+        return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
- 
- 
- def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
-     # In case we get relative paths on macOS (like @rpath) then we fall
-     # back to the basename as well:
-     # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
--    if sys.platform == "darwin":
--        if not os.path.isabs(lib):
--            return os.path.basename(lib)
--        return lib
--    else:
-+
-+    # Always use absolute paths if available
-+    if not os.path.isabs(lib):
-         return os.path.basename(lib)
-+    return lib
- 
- 
- def resolve_from_ldd_output(libraries, output):
-     patterns = {}
-     for library in libraries:
-         if not os.path.isfile(library):
--            patterns[library] = _ldd_library_pattern(library)
-+            patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
-     if len(patterns) == 0:
-         return []
- 
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
-         if line.endswith(':'):
-             continue
-         for word in line.split():
--            for library, pattern in patterns.items():
--                m = pattern.match(word)
-+            for library, (pattern, guix_pattern) in patterns.items():
-+                store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
-+                if line.find(store_dir) != -1:
-+                    m = guix_pattern.match(word)
-+                else:
-+                    m = pattern.match(word)
-                 if m:
-                     del patterns[library]
-                     shlibs.append(m.group())
-
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
-     if dlname is None:
-         return None
- 
--    # Darwin uses absolute paths where possible; since the libtool files never
--    # contain absolute paths, use the libdir field
--    if platform.system() == 'Darwin':
--        dlbasename = os.path.basename(dlname)
--        libdir = _extract_libdir_field(la_file)
--        if libdir is None:
--            return dlbasename
--        return libdir + '/' + dlbasename
--    # From the comments in extract_libtool(), older libtools had
--    # a path rather than the raw dlname
--    return os.path.basename(dlname)
-+    dlbasename = os.path.basename(dlname)
-+    libdir = _extract_libdir_field(la_file)
-+    if libdir is None:
-+        return dlbasename
-+    return libdir + '/' + dlbasename
- 
- 
- def extract_libtool(la_file):
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
- 
-         self.assertEqual(
-             sanitize_shlib_path('/foo/bar'),
--            '/foo/bar' if sys.platform == 'darwin' else 'bar')
-+            # Always use an absolute filename for Guix
-+            '/foo/bar')
- 
-     def test_unresolved_library(self):
-output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
deleted file mode 100644
index 6a86b56b44..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
---- gobject-introspection-1.58.1.orig/giscanner/__init__.py	1970-01-01 01:00:00.000000000 +0100
-+++ gobject-introspection-1.58.1/giscanner/__init__.py	2018-12-03 13:33:28.788971299 +0100
-@@ -22,6 +22,8 @@
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
-     __path__.append(os.path.join(builddir, 'giscanner'))
-+if not 'CC' in os.environ:
-+    os.environ['CC'] = 'gcc'
- try:
-     from ._version import __version__
- except ImportError:
-- 
2.28.0


--------------F97D5CBB1D1645C714E251B1
Content-Type: text/x-patch; charset=UTF-8;
 name="0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0016-gnu-gobject-introspection-Update-synopsis-descriptio.pa";
 filename*1="tch"

From 7e1d0b398fe428f5ce3fb62382d8261787c84029 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 09:11:30 -0400
Subject: [PATCH 16/16] gnu: gobject-introspection: Update synopsis,
 description, home-page and license.

* gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
---
 gnu/packages/glib.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fa43bc06a8..23ef233bd6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -363,15 +363,19 @@ threads, dynamic loading, and an object system.")
        (variable "GI_TYPELIB_PATH")
        (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
-    (synopsis "Generate interface introspection data for GObject libraries")
-    (description
-     "GObject introspection is a middleware layer between C libraries (using
-GObject) and language bindings.  The C library can be scanned at compile time
-and generate a metadata file, in addition to the actual native C library.  Then
-at runtime, language bindings can read this metadata and automatically provide
-bindings to call into the C library.")
-    (home-page "https://wiki.gnome.org/GObjectIntrospection")
-    (license license:gpl2+)))
+    (synopsis "GObject introspection tools and libraries")
+    (description "GObject introspection is a middleware layer between
+C libraries (using GObject) and language bindings.  The C library can be scanned
+at compile time and generate metadata files, in addition to the actual native
+C library.  Then language bindings can read this metadata and automatically
+provide bindings to call into the C library.")
+    (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection")
+    (license
+     (list
+      ;; For library.
+      license:lgpl2.0+
+      ;; For tools.
+      license:gpl2+))))
 
 (define intltool
   (package
-- 
2.28.0


--------------F97D5CBB1D1645C714E251B1--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:56:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:56:46 2020
Received: from localhost ([127.0.0.1]:38915 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQne-0007fS-7P
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:56:46 -0400
Received: from flashner.co.il ([178.62.234.194]:54706)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <efraim@HIDDEN>) id 1kLQnY-0007fA-LP
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:56:36 -0400
Received: from localhost (unknown [31.210.181.177])
 by flashner.co.il (Postfix) with ESMTPSA id AB10940217;
 Thu, 24 Sep 2020 12:56:26 +0000 (UTC)
Date: Thu, 24 Sep 2020 15:55:53 +0300
From: Efraim Flashner <efraim@HIDDEN>
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package
 definition.
Message-ID: <20200924125553.GC1473@E5400>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
 protocol="application/pgp-signature"; boundary="da4uJneut+ArUgXk"
Content-Disposition: inline
In-Reply-To: <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
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-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  On Thu, Sep 24, 2020 at 08:28:45AM -0400, Raghav Gururajan
 wrote: > From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00
 2001 > From: Raghav Gururajan <raghavgururajan@HIDDEN> > Date [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_SBL_CSS        RBL: Received via a relay in Spamhaus SBL-CSS
 [31.210.181.177 listed in zen.spamhaus.org]
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


--da4uJneut+ArUgXk
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 24, 2020 at 08:28:45AM -0400, Raghav Gururajan wrote:
> From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@HIDDEN>
> Date: Thu, 24 Sep 2020 04:44:59 -0400
> Subject: [PATCH 10/11] gnu: glib: Update to 2.64.3.
>=20
> * gnu/packages/glib.scm (glib) [version]: Update to 2.64.3.
> [source]<origin>[sha256]: Modify base32.
> [patches]: Add glib-disable-failing-tests.patch.
> Remove glib-tests-timer.patch.
> [arguments]<#:disallowed-references>: Remove argument.
> <#:phases>['patch-python-references]: New phase.
> ['pre-check]: New phase.
> ['move-bin]: New phase.
> ['patch-dbus-launch-path]: Remove phase.
> ['patch-gio-launch-desktop]: Remove phase.
> ['pre-build]: Remove phase.
> ['disable-failing-tests]: Remove phase.
> ['check]: Remove phase.
> ['move-executables]: Remove phase.
> [native-inputs]: Add intltool, python, libxml2 and libxslt.
> Remove dbus.
> [inputs]: Add dbus and libelf.
> * gnu/packages/patches/glib-disable-failing-tests.patch: New file.
> * gnu/packages/patches/glib-tests-timer.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Adjust.
> ---
>  gnu/local.mk                                  |   2 +-
>  gnu/packages/glib.scm                         | 179 +++++-------------
>  .../patches/glib-disable-failing-tests.patch  |  84 ++++++++
>  gnu/packages/patches/glib-tests-timer.patch   |  15 --
>  4 files changed, 136 insertions(+), 144 deletions(-)
>  create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch
>  delete mode 100644 gnu/packages/patches/glib-tests-timer.patch
>=20
> diff --git a/gnu/local.mk b/gnu/local.mk
> index f3b5b17e84..2fc47ca2ec 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1034,7 +1034,7 @@ dist_patch_DATA =3D						\
>    %D%/packages/patches/ghostscript-no-header-id.patch		\
>    %D%/packages/patches/ghostscript-no-header-uuid.patch		\
>    %D%/packages/patches/ghostscript-no-header-creationdate.patch \
> -  %D%/packages/patches/glib-tests-timer.patch			\
> +  %D%/packages/patches/glib-disable-failing-tests.patch		\
>    %D%/packages/patches/glibc-CVE-2018-11236.patch		\
>    %D%/packages/patches/glibc-CVE-2018-11237.patch		\
>    %D%/packages/patches/glibc-CVE-2019-7309.patch		\
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index 21b39b94e8..be5d45596d 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -178,7 +178,7 @@ shared NFS home directories.")
>    (package
>      (properties '((hidden? . #t)))
>      (name "glib")
> -    (version "2.62.6")
> +    (version "2.64.3")
>      (source
>       (origin
>         (method url-fetch)
> @@ -187,8 +187,9 @@ shared NFS home directories.")
>                         name "/" (string-take version 4) "/"
>                         name "-" version ".tar.xz"))
>         (sha256
> -        (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
> -       (patches (search-patches "glib-tests-timer.patch"))
> +        (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"))
> +       (patches
> +        (search-patches "glib-disable-failing-tests.patch"))
>         (modules '((guix build utils)))
>         (snippet
>          '(begin
> @@ -198,27 +199,23 @@ shared NFS home directories.")
>      (build-system meson-build-system)
>      (outputs '("out" "bin"))
>      (arguments
> -     `(#:disallowed-references (,tzdata-for-tests)
> -       #:phases
> +     `(#:phases
>         (modify-phases %standard-phases
> -         (add-after 'unpack 'patch-dbus-launch-path
> +         ;; Python references are not being patched in patch-phase of bu=
ild,
> +         ;; despite using python-wrapper as input. So we patch them manu=
ally.
> +         (add-after 'unpack 'patch-python-references
>             (lambda* (#:key inputs #:allow-other-keys)
> -             (let ((dbus (assoc-ref inputs "dbus")))
> -               (substitute* "gio/gdbusaddress.c"
> -                 (("command_line =3D g_strdup_printf \\(\"dbus-launch")
> -                  (string-append "command_line =3D g_strdup_printf (\""
> -                                 dbus "/bin/dbus-launch")))
> -               #t)))
> -         (add-after 'unpack 'patch-gio-launch-desktop
> -           (lambda* (#:key outputs #:allow-other-keys)
> -             (let ((out (assoc-ref outputs "out")))
> -               ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1=
633>
> -               ;; for another future fix.
> -               (substitute* "gio/gdesktopappinfo.c"
> -                 (("gio-launch-desktop")
> -                  (string-append out "/libexec/gio-launch-desktop")))
> -               #t)))
> -         (add-before 'build 'pre-build
> +             (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in"
> +                            "glib/gtester-report.in"
> +                            "gobject/glib-genmarshal.in"
> +                            "gobject/glib-mkenums.in")
> +               (("@PYTHON@")
> +                (string-append (assoc-ref inputs "python")
> +                               "/bin/python"
> +                               ,(version-major+minor
> +                                 (package-version python)))))

If you substitute it with (which "python") then you don't need to work
out the python version, and it looks like you don't need to add python
as an input (and you can keep using just python-wrapper).

> +             #t))
> +         (add-before 'check 'pre-check
>             (lambda* (#:key inputs outputs #:allow-other-keys)
>               ;; For tests/gdatetime.c.
>               (setenv "TZDIR"
> @@ -228,133 +225,59 @@ shared NFS home directories.")
>               (setenv "HOME" (getcwd))
>               (setenv "XDG_CACHE_HOME" (getcwd))
>               #t))
> -         (add-after 'unpack 'disable-failing-tests
> -           (lambda _
> -             (let ((disable
> -                    (lambda (test-file test-paths)
> -                      (define pattern+procs
> -                        (map (lambda (test-path)
> -                               (cons
> -                                ;; XXX: only works for single line state=
ments.
> -                                (format #f "g_test_add_func.*\"~a\".*" t=
est-path)
> -                                (const "")))
> -                             test-paths))
> -                      (substitute test-file pattern+procs)))
> -                   (failing-tests
> -                    '(("glib/tests/thread.c"
> -                       ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-=
xen-amd64
> -                        ;; as found on hydra.gnu.org, and strace(1) does=
n't
> -                        ;; recognize it.
> -                        "/thread/thread4"))
> -                      ;; This tries to find programs in FHS directories.
> -                      ("glib/tests/utils.c"
> -                       ("/utils/find-program"))
> -                      ;; This fails because "glib/tests/echo-script" can=
not be
> -                      ;; found.
> -                      ("glib/tests/spawn-singlethread.c"
> -                       ("/gthread/spawn-script"))
> -                      ("glib/tests/timer.c"
> -                       ( ;; fails if compiler optimizations are enabled,=
 which they
> -                        ;; are by default.
> -                        "/timer/stop"))
> -                      ("gio/tests/gapplication.c"
> -                       ( ;; XXX: proven to be unreliable.  See:
> -                        ;;  <https://bugs.debian.org/756273>
> -                        ;;  <http://bugs.gnu.org/18445>
> -                        "/gapplication/quit"
> -                        ;; XXX: fails randomly for unknown reason. See:
> -                        ;;  <https://lists.gnu.org/archive/html/guix-dev=
el/2016-04/msg00215.html>
> -                        "/gapplication/local-actions"))
> -                      ("gio/tests/contenttype.c"
> -                       ( ;; XXX: requires shared-mime-info.
> -                        "/contenttype/guess"
> -                        "/contenttype/guess_svg_from_data"
> -                        "/contenttype/subtype"
> -                        "/contenttype/list"
> -                        "/contenttype/icon"
> -                        "/contenttype/symbolic-icon"
> -                        "/contenttype/tree"))
> -                      ("gio/tests/appinfo.c"
> -                       ( ;; XXX: requires update-desktop-database.
> -                        "/appinfo/associations"))
> -                      ("gio/tests/desktop-app-info.c"
> -                       ( ;; XXX: requires update-desktop-database.
> -                        "/desktop-app-info/delete"
> -                        "/desktop-app-info/default"
> -                        "/desktop-app-info/fallback"
> -                        "/desktop-app-info/lastused"
> -                        "/desktop-app-info/search"))
> -                      ("gio/tests/gdbus-peer.c"
> -                       ( ;; Requires /etc/machine-id.
> -                        "/gdbus/codegen-peer-to-peer"))
> -                      ("gio/tests/gdbus-address-get-session.c"
> -                       ( ;; Requires /etc/machine-id.
> -                        "/gdbus/x11-autolaunch"))
> -                      ("gio/tests/gsocketclient-slow.c"
> -                       ( ;; These tests tries to resolve "localhost", an=
d fails.
> -                        "/socket-client/happy-eyeballs/slow"
> -                        "/socket-client/happy-eyeballs/cancellation/dela=
yed"))
> -                      )))
> -               (for-each (lambda (x) (apply disable x)) failing-tests)
> -               #t)))
> -         (replace 'check
> -           (lambda _
> -             (setenv "MESON_TESTTHREADS"
> -                     (number->string (parallel-job-count)))
> -             ;; Do not run tests marked as "flaky".
> -             (invoke "meson" "test" "--no-suite" "flaky")))
> -         ;; TODO: meson does not permit the bindir to be outside of pref=
ix.
> -         ;; See https://github.com/mesonbuild/meson/issues/2561
> -         ;; We can remove this once meson is patched.
> -         (add-after 'install 'move-executables
> +         ;; Meson does not permit the bindir to be outside of prefix.
> +         (add-after 'install 'move-bin
>             (lambda* (#:key outputs #:allow-other-keys)
> -             (let ((out (assoc-ref outputs "out"))
> -                   (bin (assoc-ref outputs "bin")))
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (assoc-ref outputs "bin")))
>                 (mkdir-p bin)
> -               (rename-file (string-append out "/bin")
> -                            (string-append bin "/bin"))
> -               ;; This one is an implementation detail of glib.
> -               ;; It is wrong that that's in "/bin" in the first place,
> -               ;; but that's what upstream is doing right now.
> -               ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
> -               (mkdir (string-append out "/libexec"))
> -               (rename-file (string-append bin "/bin/gio-launch-desktop")
> -                            (string-append out "/libexec/gio-launch-desk=
top"))
> +               (rename-file
> +                (string-append out "/bin")
> +                (string-append bin "/bin"))
>                 ;; Do not refer to "bindir", which points to "${prefix}/b=
in".
>                 ;; We don't patch "bindir" to point to "$bin/bin", becaus=
e that
>                 ;; would create a reference cycle between the "out" and "=
bin"
>                 ;; outputs.
> -               (substitute* (list (string-append out "/lib/pkgconfig/gio=
-2.0.pc")
> -                                  (string-append out "/lib/pkgconfig/gli=
b-2.0.pc"))
> +               (substitute*
> +                   (list
> +                    (string-append out "/lib/pkgconfig/gio-2.0.pc")
> +                    (string-append out "/lib/pkgconfig/glib-2.0.pc"))
>                   (("bindir=3D\\$\\{prefix\\}/bin") "")
>                   (("=3D\\$\\{bindir\\}/") "=3D"))
>                 #t))))))
>      (native-inputs
>       `(("gettext" ,gettext-minimal)
> +       ("libintl" ,intltool)
>         ("m4" ,m4)
> -       ("dbus" ,dbus)
> -       ("pkg-config" ,pkg-config)
> -       ("python" ,python-wrapper)
>         ("perl" ,perl)
> -       ("tzdata" ,tzdata-for-tests)))
> +       ("pkg-config" ,pkg-config)
> +       ("python-wrapper" ,python-wrapper)
> +       ("python" ,python)               ; For 'patch-python-references
> +       ("tzdata" ,tzdata-for-tests)
> +       ("xmllint" ,libxml2)
> +       ("xsltproc" ,libxslt)))
> +    (inputs
> +     `(("dbus" ,dbus)
> +       ("libelf" ,libelf)))
>      (propagated-inputs
> -     `(("pcre" ,pcre)
> -       ("libffi" ,libffi)
> -       ("util-linux" ,util-linux "lib")
> +     `(("libffi" ,libffi)
>         ("libselinux" ,libselinux)
> +       ("pcre" ,pcre)
> +       ("util-linux" ,util-linux "lib")
>         ("zlib" ,zlib)))
>      (native-search-paths
>       ;; This variable is not really "owned" by GLib, but several related
>       ;; packages refer to it: gobject-introspection's tools use it as a =
search
>       ;; path for .gir files, and it's also a search path for schemas pro=
duced
>       ;; by 'glib-compile-schemas'.
> -     (list (search-path-specification
> -            (variable "XDG_DATA_DIRS")
> -            (files '("share")))
> -           ;; To load extra gio modules from glib-networking, etc.
> -           (search-path-specification
> -            (variable "GIO_EXTRA_MODULES")
> -            (files '("lib/gio/modules")))))
> +     (list
> +      (search-path-specification
> +       (variable "XDG_DATA_DIRS")
> +       (files '("share")))
> +      ;; To load extra gio modules from glib-networking, etc.
> +      (search-path-specification
> +       (variable "GIO_EXTRA_MODULES")
> +       (files '("lib/gio/modules")))))
>      (search-paths native-search-paths)
>      (synopsis "Thread-safe general utility library; basis of GTK+ and GN=
OME")
>      (description
> diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/=
packages/patches/glib-disable-failing-tests.patch
> new file mode 100644
> index 0000000000..3601c42030
> --- /dev/null
> +++ b/gnu/packages/patches/glib-disable-failing-tests.patch
> @@ -0,0 +1,84 @@
> +From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001
> +From: Raghav Gururajan <raghavgururajan@HIDDEN>
> +Date: Tue, 9 Jun 2020 05:17:53 -0400
> +Subject: [PATCH] PATCH: Disable failing tests.
> +
> +---
> + gio/tests/meson.build  | 19 -------------------
> + glib/tests/meson.build |  2 --
> + 2 files changed, 21 deletions(-)
> +
> +diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> +index c7c3e3035..6e38eb39e 100644
> +--- a/gio/tests/meson.build
> ++++ b/gio/tests/meson.build
> +@@ -34,7 +34,6 @@ gio_tests =3D {
> +   'buffered-output-stream' : {},
> +   'cancellable' : {},
> +   'contexts' : {},
> +-  'contenttype' : {},
> +   'converter-stream' : {},
> +   'credentials' : {},
> +   'data-input-stream' : {},
> +@@ -78,7 +77,6 @@ gio_tests =3D {
> +   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
> +   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
> +   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
> +-  'gdbus-address-get-session' : {},
> +   'win32-appinfo' : {},
> + }
> +=20
> +@@ -135,10 +133,6 @@ endif
> + if host_machine.system() !=3D 'windows'
> +   gio_tests +=3D {
> +     'file' : {},
> +-    'gdbus-peer' : {
> +-      'dependencies' : [libgdbus_example_objectmanager_dep],
> +-      'install_rpath' : installed_tests_execdir
> +-    },
> +     'gdbus-peer-object-manager' : {},
> +     'live-g-file' : {},
> +     'socket-address' : {},
> +@@ -173,19 +167,6 @@ if host_machine.system() !=3D 'windows'
> +     }
> +   endif
> +=20
> +-  # Uninstalled because of the check-for-executable logic in DesktopApp=
Info
> +-  # unable to find the installed executable
> +-  if not glib_have_cocoa
> +-    gio_tests +=3D {
> +-      'appinfo' : {
> +-        'install' : false,
> +-      },
> +-      'desktop-app-info' : {
> +-        'install' : false,
> +-      },
> +-    }
> +-  endif
> +-
> +   test_extra_programs +=3D {
> +     'basic-application' : {},
> +     'dbus-launch' : {},
> +diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> +index 8da477d19..9fa24dd49 100644
> +--- a/glib/tests/meson.build
> ++++ b/glib/tests/meson.build
> +@@ -103,7 +103,6 @@ glib_tests =3D {
> +   'utf8-pointer' : {},
> +   'utf8-validate' : {},
> +   'utf8-misc' : {},
> +-  'utils' : {},
> +   'unicode' : {},
> +   'uri' : {},
> +   '1bit-mutex' : {},
> +@@ -151,7 +150,6 @@ if host_machine.system() =3D=3D 'windows'
> + else
> +   glib_tests +=3D {
> +     'include' : {},
> +-    'unix' : {},
> +   }
> +   if have_rtld_next
> +     glib_tests +=3D {
> +--=20
> +2.26.2
> +
> diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p=
atches/glib-tests-timer.patch
> deleted file mode 100644
> index e37425c0c8..0000000000
> --- a/gnu/packages/patches/glib-tests-timer.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -* On i686 floating-point roundoff errors could sometimes cause this chec=
k to
> -  fail depending on the elapsed microseconds.  Improve rounding by addin=
g a
> -  fractional bit.
> -
> ---- glib-2.40.0/glib/tests/timer.c	2014-03-05 08:05:42.000000000 -0600
> -+++ glib-2.40.0/glib/tests/timer.c	2014-07-10 16:33:12.746862822 -0500
> -@@ -35,7 +35,7 @@
> -   elapsed =3D g_timer_elapsed (timer, &micros);
> -=20
> -   g_assert_cmpfloat (elapsed, <, 1.0);
> --  g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000=
0);
> -+  g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % =
1000000);
> -=20
> -   g_timer_destroy (timer);
> - }
> --=20
> 2.28.0
>=20


--=20
Efraim Flashner   <efraim@HIDDEN>   =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

--da4uJneut+ArUgXk
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl9sl1kACgkQQarn3Mo9
g1G3/Q//bH2XG3QfadStD+zyOCnrXWT06BfeJbyNDiwiKXgn+kaKiBxd6FtcJOKp
Iw9HsF9BkB0ygfHmeSzXSVfMRMhqL2ERXbhDnEglmIA04kV4jmkG5BzuSyDc2o8I
E3551cYvliqTdILAb4eF5asnlcpzWi2LWCJdSJitb44rjYaGFCGuiFchZh3fYowG
xdU3u/6+Hl6PVpCKxK+0nOrGXZBKxkMPbi1C8m3m+/Q8ZaZd/kDWcDxiBEb6pH5n
9yX77gvsMD7qfcj8GDo9gnwTRdZMmU4QCkErf6swrBXgHJCJu5f5ivX36HIHfxuN
ll98YKAj56fHJlwjFt3UYmdQwhauadmxVBpD5O5+rgGKMjfzHmalaOovPCzveO11
5DurZPtpxWEiOecTd6ZR1YgdkUjGCI4JT/D+FRr0DMVoLO9iSpOsXONU+IylTtMt
DoNGu55k3+X4vK/8BipQeVlB7aC6DI65kEnXLZs862lKo947YoSA72iuJfARLxnz
kMVPoRcs9tN5VhG9vLgu8vUooiHlGKLCWLeDN90KaMTByYnmZ8a7030IcWuKSHKB
OtB1jRS3G/7TXpFJe72kRid9G+aDfcIEtvWMu/DoeYvfdmGKdEFhMxWPRS9+S4G9
jn52Re3KosVtGJOtgqVIaoeO7ZFWSdDTKf+5dSXQQOcBOWI6VbA=
=VIjz
-----END PGP SIGNATURE-----

--da4uJneut+ArUgXk--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:51:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:51:33 2020
Received: from localhost ([127.0.0.1]:38895 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQij-0007XB-0T
	for submit <at> 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 <efraim@HIDDEN>) id 1kLQih-0007Ww-1N
 for 42958 <at> 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 <efraim@HIDDEN>
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 04/29] gnu:
 glib-with-documentation: Update, package definition.
Message-ID: <20200924125047.GB1473@E5400>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <8922c4a6-4f24-923b-2509-d3cf89b15ea6@HIDDEN>
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@HIDDEN>
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-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan
 wrote: > @Danny > > Please find the attached split patches. > > Regards,
 > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00
 2001 > From: Raghav Gururajan <raghavgururajan@HIDDEN> > Date: Thu, 24
 Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: gl [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 3.6 RCVD_IN_SBL_CSS        RBL: Received via a relay in Spamhaus SBL-CSS
 [31.210.181.177 listed in zen.spamhaus.org]
X-Debbugs-Envelope-To: 42958
Cc: 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan
    wrote: > @Danny > > Please find the attached split patches. > > Regards,
   > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00
   2001 > From: Raghav Gururajan <raghavgururajan@HIDDEN> > Date: Thu, 24
    Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: gl [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_SBL_CSS        RBL: Received via a relay in Spamhaus SBL-CSS
                             [31.210.181.177 listed in zen.spamhaus.org]
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager


--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 <raghavgururajan@HIDDEN>
> 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 <raghavgururajan@HIDDEN>
> 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   <efraim@HIDDEN>   =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--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:41:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:41:58 2020
Received: from localhost ([127.0.0.1]:38885 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQZS-0007Ip-0F
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:41:58 -0400
Received: from knopi.disroot.org ([178.21.23.139]:46562)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLQZP-0007If-Mr
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:41:56 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id BEAB551BD9
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 14:41:53 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id RyFB4HH8FdHv for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 14:41:52 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600951312; bh=gKm9+EUEdsySViDj8pRtii9fyQEVjeW2AhYpE9rOldk=;
 h=To:From:Subject:Date;
 b=Zo0attPakR2eeBGkyMX18qE2qnsC8xM7gv/NK624b5k37fiwmTKyTsEik12oS9rPL
 8Ge22Sz3DdBLXNXaLDq0QCC2WQINnymMx+9g0c77Z1ke7kpepg+cUej4u+WLAacETR
 pV8/cdEjpLuOFJ0FuHqYRX957D5AMqm3u+/VdIDdxvG5iahNwWv6RnZlyZAVa4AjGt
 c9BMCpSpRjOJJe9Yqb+ecrmIO9uPtJhklb89u+vNMPF+lOCWX6hmz8tWoykGRJBcbR
 0Uhf7yqqN3zRWx/B82ZgAMq9x+iTBmxVnM5N14mAfKpgJk714AFLoHOtLBFhHdofOL
 Joi3THk+YpAKw==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, 
 package definition.
Message-ID: <8922c4a6-4f24-923b-2509-d3cf89b15ea6@HIDDEN>
Date: Thu, 24 Sep 2020 08:41:50 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------E4D6D1AEF5173968E9AE0766"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------E4D6D1AEF5173968E9AE0766
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------E4D6D1AEF5173968E9AE0766
Content-Type: text/x-patch; charset=UTF-8;
 name="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa";
 filename*1="tch"

From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 08:35:29 -0400
Subject: [PATCH 12/13] gnu: glib-with-documentation: Make some cosmetic
 changes.

* gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic changes.
---
 gnu/packages/glib.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 reference
-    (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)))))
 
 (define gobject-introspection
   (package
-- 
2.28.0


--------------E4D6D1AEF5173968E9AE0766
Content-Type: text/x-patch; charset=UTF-8;
 name="0013-gnu-glib-with-documentation-Fix-documentation.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0013-gnu-glib-with-documentation-Fix-documentation.patch"

From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 08:39:00 -0400
Subject: [PATCH 13/13] gnu: glib-with-documentation: Fix documentation.

* 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(-)

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=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))
+               (let* ((out (assoc-ref outputs "out"))
+                      (doc (assoc-ref outputs "doc"))
+                      (html (string-append "/share/gtk-doc")))
+                 (mkdir-p (string-append doc "/share"))
+                 (rename-file
+                  (string-append out html)
+                  (string-append doc html))
                  #t)))))))
     (native-inputs
      `(("docbook-xml" ,docbook-xml)
-- 
2.28.0


--------------E4D6D1AEF5173968E9AE0766--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:29:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:29:05 2020
Received: from localhost ([127.0.0.1]:38843 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQMq-0006yU-ST
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:29:05 -0400
Received: from knopi.disroot.org ([178.21.23.139]:32948)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLQMm-0006yJ-Fu
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:28:56 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id C109051BEB
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 14:28:51 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id dkp7aI0jHmAt for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 14:28:48 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600950526; bh=wdlshdPeya3Tjavwrc6kgqYl52eDRrZzpj4jdBWHmZA=;
 h=To:From:Subject:Date;
 b=H1m5+5t+VZ89HAORL112ENYLkIguo2web9t1SkJxJJmhOaWrD9h/dZ+6d/ex3z/Na
 dWWvsywF6gYQKSWglCBY22Pkl2XJwTDaZJu/oC2zV9BUvo8eMW3+n0xMC69+qFsBuX
 457K9I4GHpPWkOpAB/BB8rPTsnmOe8WlHtIQf7HK90VoDKohYoNG7i94MoSpivN8R3
 qs26ZIqKs5hgoyGwtCbCq9EiU6KkYcH/SQAcmKITgRF9cKM1asNuJbQ8nJ72ub62gT
 U9b/qXPIElBqQdYsVE/O5rxOPLuOWw3R/wLHhqyvOvAAP/wvviXzNcZxiwRgdgn9no
 EVb2JcNPbyNYw==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 03/29] gnu: glib: Update package definition.
Message-ID: <5acf11ff-2410-d336-4037-8e7665c78083@HIDDEN>
Date: Thu, 24 Sep 2020 08:28:45 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------50BA6B1176403916C0EC24C7"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------50BA6B1176403916C0EC24C7
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------50BA6B1176403916C0EC24C7
Content-Type: text/x-patch; charset=UTF-8;
 name="0009-gnu-glib-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0009-gnu-glib-Make-some-cosmetic-changes.patch"

From 8cd190b19c52da07c6b400be1a703f27ceaf142d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:34:05 -0400
Subject: [PATCH 09/11] gnu: glib: Make some cosmetic changes.

* gnu/packages/glib.scm (glib): Make some cosmetic changes.
---
 gnu/packages/glib.scm | 390 ++++++++++++++++++++----------------------
 1 file changed, 185 insertions(+), 205 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ca037d3b24..21b39b94e8 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -176,213 +176,193 @@ shared NFS home directories.")
 
 (define glib
   (package
-   (name "glib")
-   (version "2.62.6")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/"
-                                name "/" (string-take version 4) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
-            (patches (search-patches "glib-tests-timer.patch"))
-            (modules '((guix build utils)))
-            (snippet
-             '(begin
-                (substitute* "tests/spawn-test.c"
-                  (("/bin/sh") "sh"))
-                #t))))
-   (build-system meson-build-system)
-   (outputs '("out"           ; everything
-              "bin"))         ; glib-mkenums, gtester, etc.; depends on Python
-   (propagated-inputs
-    `(("pcre" ,pcre)  ; in the Requires.private field of glib-2.0.pc
-      ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc
-      ;; These are in the Requires.private field of gio-2.0.pc
-      ("util-linux" ,util-linux "lib")  ;for libmount
-      ("libselinux" ,libselinux)
-      ("zlib" ,zlib)))
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("m4" ,m4) ; for installing m4 macros
-      ("dbus" ,dbus)                              ; for GDBus tests
-      ("pkg-config" ,pkg-config)
-      ("python" ,python-wrapper)
-      ("perl" ,perl)                              ; needed by GIO tests
-      ("tzdata" ,tzdata-for-tests)))                  ; for tests/gdatetime.c
-   (arguments
-    `(#:disallowed-references (,tzdata-for-tests)
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'patch-dbus-launch-path
-          (lambda* (#:key inputs #:allow-other-keys)
-            (let ((dbus (assoc-ref inputs "dbus")))
-              (substitute* "gio/gdbusaddress.c"
-                (("command_line = g_strdup_printf \\(\"dbus-launch")
-                 (string-append "command_line = g_strdup_printf (\""
-                                dbus "/bin/dbus-launch")))
-              #t)))
-        (add-after 'unpack 'patch-gio-launch-desktop
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
-              ;; for another future fix.
-              (substitute* "gio/gdesktopappinfo.c"
-               (("gio-launch-desktop")
-                (string-append out "/libexec/gio-launch-desktop")))
-              #t)))
-        (add-before 'build 'pre-build
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            ;; For tests/gdatetime.c.
-            (setenv "TZDIR"
-                    (string-append (assoc-ref inputs "tzdata")
-                                   "/share/zoneinfo"))
-
-            ;; Some tests want write access there.
-            (setenv "HOME" (getcwd))
-            (setenv "XDG_CACHE_HOME" (getcwd))
-            #t))
-        (add-after 'unpack 'disable-failing-tests
-          (lambda _
-            (let ((disable
-                   (lambda (test-file test-paths)
-                     (define pattern+procs
-                       (map (lambda (test-path)
-                              (cons
-                               ;; XXX: only works for single line statements.
-                               (format #f "g_test_add_func.*\"~a\".*" test-path)
-                               (const "")))
-                            test-paths))
-                     (substitute test-file pattern+procs)))
-                  (failing-tests
-                   '(("glib/tests/thread.c"
-                      (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64
-                       ;; as found on hydra.gnu.org, and strace(1) doesn't
-                       ;; recognize it.
-                       "/thread/thread4"))
-
-                     ;; This tries to find programs in FHS directories.
-                     ("glib/tests/utils.c"
-                      ("/utils/find-program"))
-
-                     ;; This fails because "glib/tests/echo-script" cannot be
-                     ;; found.
-                     ("glib/tests/spawn-singlethread.c"
-                      ("/gthread/spawn-script"))
-
-                     ("glib/tests/timer.c"
-                      (;; fails if compiler optimizations are enabled, which they
-                       ;; are by default.
-                       "/timer/stop"))
-
-                     ("gio/tests/gapplication.c"
-                      (;; XXX: proven to be unreliable.  See:
-                       ;;  <https://bugs.debian.org/756273>
-                       ;;  <http://bugs.gnu.org/18445>
-                       "/gapplication/quit"
-
-                       ;; XXX: fails randomly for unknown reason. See:
-                       ;;  <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00215.html>
-                       "/gapplication/local-actions"))
-
-                     ("gio/tests/contenttype.c"
-                      (;; XXX: requires shared-mime-info.
-                       "/contenttype/guess"
-                       "/contenttype/guess_svg_from_data"
-                       "/contenttype/subtype"
-                       "/contenttype/list"
-                       "/contenttype/icon"
-                       "/contenttype/symbolic-icon"
-                       "/contenttype/tree"))
-
-                     ("gio/tests/appinfo.c"
-                      (;; XXX: requires update-desktop-database.
-                       "/appinfo/associations"))
-
-                     ("gio/tests/desktop-app-info.c"
-                      (;; XXX: requires update-desktop-database.
-                       "/desktop-app-info/delete"
-                       "/desktop-app-info/default"
-                       "/desktop-app-info/fallback"
-                       "/desktop-app-info/lastused"
-                       "/desktop-app-info/search"))
-
-                     ("gio/tests/gdbus-peer.c"
-                      (;; Requires /etc/machine-id.
-                       "/gdbus/codegen-peer-to-peer"))
-
-                     ("gio/tests/gdbus-address-get-session.c"
-                      (;; Requires /etc/machine-id.
-                       "/gdbus/x11-autolaunch"))
-
-                     ("gio/tests/gsocketclient-slow.c"
-                      (;; These tests tries to resolve "localhost", and fails.
-                       "/socket-client/happy-eyeballs/slow"
-                       "/socket-client/happy-eyeballs/cancellation/delayed"))
-
-                     )))
-              (for-each (lambda (x) (apply disable x)) failing-tests)
-              #t)))
-        (replace 'check
-          (lambda _
-            (setenv "MESON_TESTTHREADS"
-                    (number->string (parallel-job-count)))
-            ;; Do not run tests marked as "flaky".
-            (invoke "meson" "test" "--no-suite" "flaky")))
-        ;; TODO: meson does not permit the bindir to be outside of prefix.
-        ;; See https://github.com/mesonbuild/meson/issues/2561
-        ;; We can remove this once meson is patched.
-        (add-after 'install 'move-executables
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (bin (assoc-ref outputs "bin")))
-              (mkdir-p bin)
-              (rename-file (string-append out "/bin")
-                           (string-append bin "/bin"))
-              ;; This one is an implementation detail of glib.
-              ;; It is wrong that that's in "/bin" in the first place,
-              ;; but that's what upstream is doing right now.
-              ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
-              (mkdir (string-append out "/libexec"))
-              (rename-file (string-append bin "/bin/gio-launch-desktop")
-                           (string-append out "/libexec/gio-launch-desktop"))
-              ;; Do not refer to "bindir", which points to "${prefix}/bin".
-              ;; We don't patch "bindir" to point to "$bin/bin", because that
-              ;; would create a reference cycle between the "out" and "bin"
-              ;; outputs.
-              (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc")
-                                 (string-append out "/lib/pkgconfig/glib-2.0.pc"))
-                (("bindir=\\$\\{prefix\\}/bin") "")
-                (("=\\$\\{bindir\\}/") "="))
-              #t))))))
-      ;; TODO: see above for explanation.
-      ;; #:configure-flags (list (string-append "--bindir="
-      ;;                                        (assoc-ref %outputs "bin")
-      ;;                                        "/bin"))
-
-   (native-search-paths
-    ;; This variable is not really "owned" by GLib, but several related
-    ;; packages refer to it: gobject-introspection's tools use it as a search
-    ;; path for .gir files, and it's also a search path for schemas produced
-    ;; by 'glib-compile-schemas'.
-    (list (search-path-specification
-           (variable "XDG_DATA_DIRS")
-           (files '("share")))
-          ;; To load extra gio modules from glib-networking, etc.
-          (search-path-specification
-           (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
-    "GLib provides data structure handling for C, portability wrappers,
+    (properties '((hidden? . #t)))
+    (name "glib")
+    (version "2.62.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       name "/" (string-take version 4) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
+       (patches (search-patches "glib-tests-timer.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "tests/spawn-test.c"
+             (("/bin/sh") "sh"))
+           #t))))
+    (build-system meson-build-system)
+    (outputs '("out" "bin"))
+    (arguments
+     `(#:disallowed-references (,tzdata-for-tests)
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-dbus-launch-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((dbus (assoc-ref inputs "dbus")))
+               (substitute* "gio/gdbusaddress.c"
+                 (("command_line = g_strdup_printf \\(\"dbus-launch")
+                  (string-append "command_line = g_strdup_printf (\""
+                                 dbus "/bin/dbus-launch")))
+               #t)))
+         (add-after 'unpack 'patch-gio-launch-desktop
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
+               ;; for another future fix.
+               (substitute* "gio/gdesktopappinfo.c"
+                 (("gio-launch-desktop")
+                  (string-append out "/libexec/gio-launch-desktop")))
+               #t)))
+         (add-before 'build 'pre-build
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; For tests/gdatetime.c.
+             (setenv "TZDIR"
+                     (string-append (assoc-ref inputs "tzdata")
+                                    "/share/zoneinfo"))
+             ;; Some tests want write access there.
+             (setenv "HOME" (getcwd))
+             (setenv "XDG_CACHE_HOME" (getcwd))
+             #t))
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (let ((disable
+                    (lambda (test-file test-paths)
+                      (define pattern+procs
+                        (map (lambda (test-path)
+                               (cons
+                                ;; XXX: only works for single line statements.
+                                (format #f "g_test_add_func.*\"~a\".*" test-path)
+                                (const "")))
+                             test-paths))
+                      (substitute test-file pattern+procs)))
+                   (failing-tests
+                    '(("glib/tests/thread.c"
+                       ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64
+                        ;; as found on hydra.gnu.org, and strace(1) doesn't
+                        ;; recognize it.
+                        "/thread/thread4"))
+                      ;; This tries to find programs in FHS directories.
+                      ("glib/tests/utils.c"
+                       ("/utils/find-program"))
+                      ;; This fails because "glib/tests/echo-script" cannot be
+                      ;; found.
+                      ("glib/tests/spawn-singlethread.c"
+                       ("/gthread/spawn-script"))
+                      ("glib/tests/timer.c"
+                       ( ;; fails if compiler optimizations are enabled, which they
+                        ;; are by default.
+                        "/timer/stop"))
+                      ("gio/tests/gapplication.c"
+                       ( ;; XXX: proven to be unreliable.  See:
+                        ;;  <https://bugs.debian.org/756273>
+                        ;;  <http://bugs.gnu.org/18445>
+                        "/gapplication/quit"
+                        ;; XXX: fails randomly for unknown reason. See:
+                        ;;  <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00215.html>
+                        "/gapplication/local-actions"))
+                      ("gio/tests/contenttype.c"
+                       ( ;; XXX: requires shared-mime-info.
+                        "/contenttype/guess"
+                        "/contenttype/guess_svg_from_data"
+                        "/contenttype/subtype"
+                        "/contenttype/list"
+                        "/contenttype/icon"
+                        "/contenttype/symbolic-icon"
+                        "/contenttype/tree"))
+                      ("gio/tests/appinfo.c"
+                       ( ;; XXX: requires update-desktop-database.
+                        "/appinfo/associations"))
+                      ("gio/tests/desktop-app-info.c"
+                       ( ;; XXX: requires update-desktop-database.
+                        "/desktop-app-info/delete"
+                        "/desktop-app-info/default"
+                        "/desktop-app-info/fallback"
+                        "/desktop-app-info/lastused"
+                        "/desktop-app-info/search"))
+                      ("gio/tests/gdbus-peer.c"
+                       ( ;; Requires /etc/machine-id.
+                        "/gdbus/codegen-peer-to-peer"))
+                      ("gio/tests/gdbus-address-get-session.c"
+                       ( ;; Requires /etc/machine-id.
+                        "/gdbus/x11-autolaunch"))
+                      ("gio/tests/gsocketclient-slow.c"
+                       ( ;; These tests tries to resolve "localhost", and fails.
+                        "/socket-client/happy-eyeballs/slow"
+                        "/socket-client/happy-eyeballs/cancellation/delayed"))
+                      )))
+               (for-each (lambda (x) (apply disable x)) failing-tests)
+               #t)))
+         (replace 'check
+           (lambda _
+             (setenv "MESON_TESTTHREADS"
+                     (number->string (parallel-job-count)))
+             ;; Do not run tests marked as "flaky".
+             (invoke "meson" "test" "--no-suite" "flaky")))
+         ;; TODO: meson does not permit the bindir to be outside of prefix.
+         ;; See https://github.com/mesonbuild/meson/issues/2561
+         ;; We can remove this once meson is patched.
+         (add-after 'install 'move-executables
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (bin (assoc-ref outputs "bin")))
+               (mkdir-p bin)
+               (rename-file (string-append out "/bin")
+                            (string-append bin "/bin"))
+               ;; This one is an implementation detail of glib.
+               ;; It is wrong that that's in "/bin" in the first place,
+               ;; but that's what upstream is doing right now.
+               ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
+               (mkdir (string-append out "/libexec"))
+               (rename-file (string-append bin "/bin/gio-launch-desktop")
+                            (string-append out "/libexec/gio-launch-desktop"))
+               ;; Do not refer to "bindir", which points to "${prefix}/bin".
+               ;; We don't patch "bindir" to point to "$bin/bin", because that
+               ;; would create a reference cycle between the "out" and "bin"
+               ;; outputs.
+               (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc")
+                                  (string-append out "/lib/pkgconfig/glib-2.0.pc"))
+                 (("bindir=\\$\\{prefix\\}/bin") "")
+                 (("=\\$\\{bindir\\}/") "="))
+               #t))))))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("m4" ,m4)
+       ("dbus" ,dbus)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("perl" ,perl)
+       ("tzdata" ,tzdata-for-tests)))
+    (propagated-inputs
+     `(("pcre" ,pcre)
+       ("libffi" ,libffi)
+       ("util-linux" ,util-linux "lib")
+       ("libselinux" ,libselinux)
+       ("zlib" ,zlib)))
+    (native-search-paths
+     ;; This variable is not really "owned" by GLib, but several related
+     ;; packages refer to it: gobject-introspection's tools use it as a search
+     ;; path for .gir files, and it's also a search path for schemas produced
+     ;; by 'glib-compile-schemas'.
+     (list (search-path-specification
+            (variable "XDG_DATA_DIRS")
+            (files '("share")))
+           ;; To load extra gio modules from glib-networking, etc.
+           (search-path-specification
+            (variable "GIO_EXTRA_MODULES")
+            (files '("lib/gio/modules")))))
+    (search-paths native-search-paths)
+    (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
+    (description
+     "GLib provides data structure handling for C, portability wrappers,
 and interfaces for such runtime functionality as an event loop, threads,
 dynamic loading, and an object system.")
-   (home-page "https://developer.gnome.org/glib/")
-   (license license:lgpl2.1+)))
+    (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,
-- 
2.28.0


--------------50BA6B1176403916C0EC24C7
Content-Type: text/x-patch; charset=UTF-8;
 name="0010-gnu-glib-Update-to-2.64.3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0010-gnu-glib-Update-to-2.64.3.patch"

From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:44:59 -0400
Subject: [PATCH 10/11] gnu: glib: Update to 2.64.3.

* gnu/packages/glib.scm (glib) [version]: Update to 2.64.3.
[source]<origin>[sha256]: Modify base32.
[patches]: Add glib-disable-failing-tests.patch.
Remove glib-tests-timer.patch.
[arguments]<#:disallowed-references>: Remove argument.
<#:phases>['patch-python-references]: New phase.
['pre-check]: New phase.
['move-bin]: New phase.
['patch-dbus-launch-path]: Remove phase.
['patch-gio-launch-desktop]: Remove phase.
['pre-build]: Remove phase.
['disable-failing-tests]: Remove phase.
['check]: Remove phase.
['move-executables]: Remove phase.
[native-inputs]: Add intltool, python, libxml2 and libxslt.
Remove dbus.
[inputs]: Add dbus and libelf.
* gnu/packages/patches/glib-disable-failing-tests.patch: New file.
* gnu/packages/patches/glib-tests-timer.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust.
---
 gnu/local.mk                                  |   2 +-
 gnu/packages/glib.scm                         | 179 +++++-------------
 .../patches/glib-disable-failing-tests.patch  |  84 ++++++++
 gnu/packages/patches/glib-tests-timer.patch   |  15 --
 4 files changed, 136 insertions(+), 144 deletions(-)
 create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch
 delete mode 100644 gnu/packages/patches/glib-tests-timer.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f3b5b17e84..2fc47ca2ec 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1034,7 +1034,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
-  %D%/packages/patches/glib-tests-timer.patch			\
+  %D%/packages/patches/glib-disable-failing-tests.patch		\
   %D%/packages/patches/glibc-CVE-2018-11236.patch		\
   %D%/packages/patches/glibc-CVE-2018-11237.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 21b39b94e8..be5d45596d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -178,7 +178,7 @@ shared NFS home directories.")
   (package
     (properties '((hidden? . #t)))
     (name "glib")
-    (version "2.62.6")
+    (version "2.64.3")
     (source
      (origin
        (method url-fetch)
@@ -187,8 +187,9 @@ shared NFS home directories.")
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
-       (patches (search-patches "glib-tests-timer.patch"))
+        (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"))
+       (patches
+        (search-patches "glib-disable-failing-tests.patch"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -198,27 +199,23 @@ shared NFS home directories.")
     (build-system meson-build-system)
     (outputs '("out" "bin"))
     (arguments
-     `(#:disallowed-references (,tzdata-for-tests)
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-dbus-launch-path
+         ;; Python references are not being patched in patch-phase of build,
+         ;; despite using python-wrapper as input. So we patch them manually.
+         (add-after 'unpack 'patch-python-references
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((dbus (assoc-ref inputs "dbus")))
-               (substitute* "gio/gdbusaddress.c"
-                 (("command_line = g_strdup_printf \\(\"dbus-launch")
-                  (string-append "command_line = g_strdup_printf (\""
-                                 dbus "/bin/dbus-launch")))
-               #t)))
-         (add-after 'unpack 'patch-gio-launch-desktop
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
-               ;; for another future fix.
-               (substitute* "gio/gdesktopappinfo.c"
-                 (("gio-launch-desktop")
-                  (string-append out "/libexec/gio-launch-desktop")))
-               #t)))
-         (add-before 'build 'pre-build
+             (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in"
+                            "glib/gtester-report.in"
+                            "gobject/glib-genmarshal.in"
+                            "gobject/glib-mkenums.in")
+               (("@PYTHON@")
+                (string-append (assoc-ref inputs "python")
+                               "/bin/python"
+                               ,(version-major+minor
+                                 (package-version python)))))
+             #t))
+         (add-before 'check 'pre-check
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; For tests/gdatetime.c.
              (setenv "TZDIR"
@@ -228,133 +225,59 @@ shared NFS home directories.")
              (setenv "HOME" (getcwd))
              (setenv "XDG_CACHE_HOME" (getcwd))
              #t))
-         (add-after 'unpack 'disable-failing-tests
-           (lambda _
-             (let ((disable
-                    (lambda (test-file test-paths)
-                      (define pattern+procs
-                        (map (lambda (test-path)
-                               (cons
-                                ;; XXX: only works for single line statements.
-                                (format #f "g_test_add_func.*\"~a\".*" test-path)
-                                (const "")))
-                             test-paths))
-                      (substitute test-file pattern+procs)))
-                   (failing-tests
-                    '(("glib/tests/thread.c"
-                       ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64
-                        ;; as found on hydra.gnu.org, and strace(1) doesn't
-                        ;; recognize it.
-                        "/thread/thread4"))
-                      ;; This tries to find programs in FHS directories.
-                      ("glib/tests/utils.c"
-                       ("/utils/find-program"))
-                      ;; This fails because "glib/tests/echo-script" cannot be
-                      ;; found.
-                      ("glib/tests/spawn-singlethread.c"
-                       ("/gthread/spawn-script"))
-                      ("glib/tests/timer.c"
-                       ( ;; fails if compiler optimizations are enabled, which they
-                        ;; are by default.
-                        "/timer/stop"))
-                      ("gio/tests/gapplication.c"
-                       ( ;; XXX: proven to be unreliable.  See:
-                        ;;  <https://bugs.debian.org/756273>
-                        ;;  <http://bugs.gnu.org/18445>
-                        "/gapplication/quit"
-                        ;; XXX: fails randomly for unknown reason. See:
-                        ;;  <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00215.html>
-                        "/gapplication/local-actions"))
-                      ("gio/tests/contenttype.c"
-                       ( ;; XXX: requires shared-mime-info.
-                        "/contenttype/guess"
-                        "/contenttype/guess_svg_from_data"
-                        "/contenttype/subtype"
-                        "/contenttype/list"
-                        "/contenttype/icon"
-                        "/contenttype/symbolic-icon"
-                        "/contenttype/tree"))
-                      ("gio/tests/appinfo.c"
-                       ( ;; XXX: requires update-desktop-database.
-                        "/appinfo/associations"))
-                      ("gio/tests/desktop-app-info.c"
-                       ( ;; XXX: requires update-desktop-database.
-                        "/desktop-app-info/delete"
-                        "/desktop-app-info/default"
-                        "/desktop-app-info/fallback"
-                        "/desktop-app-info/lastused"
-                        "/desktop-app-info/search"))
-                      ("gio/tests/gdbus-peer.c"
-                       ( ;; Requires /etc/machine-id.
-                        "/gdbus/codegen-peer-to-peer"))
-                      ("gio/tests/gdbus-address-get-session.c"
-                       ( ;; Requires /etc/machine-id.
-                        "/gdbus/x11-autolaunch"))
-                      ("gio/tests/gsocketclient-slow.c"
-                       ( ;; These tests tries to resolve "localhost", and fails.
-                        "/socket-client/happy-eyeballs/slow"
-                        "/socket-client/happy-eyeballs/cancellation/delayed"))
-                      )))
-               (for-each (lambda (x) (apply disable x)) failing-tests)
-               #t)))
-         (replace 'check
-           (lambda _
-             (setenv "MESON_TESTTHREADS"
-                     (number->string (parallel-job-count)))
-             ;; Do not run tests marked as "flaky".
-             (invoke "meson" "test" "--no-suite" "flaky")))
-         ;; TODO: meson does not permit the bindir to be outside of prefix.
-         ;; See https://github.com/mesonbuild/meson/issues/2561
-         ;; We can remove this once meson is patched.
-         (add-after 'install 'move-executables
+         ;; Meson does not permit the bindir to be outside of prefix.
+         (add-after 'install 'move-bin
            (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (bin (assoc-ref outputs "bin")))
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (assoc-ref outputs "bin")))
                (mkdir-p bin)
-               (rename-file (string-append out "/bin")
-                            (string-append bin "/bin"))
-               ;; This one is an implementation detail of glib.
-               ;; It is wrong that that's in "/bin" in the first place,
-               ;; but that's what upstream is doing right now.
-               ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
-               (mkdir (string-append out "/libexec"))
-               (rename-file (string-append bin "/bin/gio-launch-desktop")
-                            (string-append out "/libexec/gio-launch-desktop"))
+               (rename-file
+                (string-append out "/bin")
+                (string-append bin "/bin"))
                ;; Do not refer to "bindir", which points to "${prefix}/bin".
                ;; We don't patch "bindir" to point to "$bin/bin", because that
                ;; would create a reference cycle between the "out" and "bin"
                ;; outputs.
-               (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc")
-                                  (string-append out "/lib/pkgconfig/glib-2.0.pc"))
+               (substitute*
+                   (list
+                    (string-append out "/lib/pkgconfig/gio-2.0.pc")
+                    (string-append out "/lib/pkgconfig/glib-2.0.pc"))
                  (("bindir=\\$\\{prefix\\}/bin") "")
                  (("=\\$\\{bindir\\}/") "="))
                #t))))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
+       ("libintl" ,intltool)
        ("m4" ,m4)
-       ("dbus" ,dbus)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
        ("perl" ,perl)
-       ("tzdata" ,tzdata-for-tests)))
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)
+       ("python" ,python)               ; For 'patch-python-references
+       ("tzdata" ,tzdata-for-tests)
+       ("xmllint" ,libxml2)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("libelf" ,libelf)))
     (propagated-inputs
-     `(("pcre" ,pcre)
-       ("libffi" ,libffi)
-       ("util-linux" ,util-linux "lib")
+     `(("libffi" ,libffi)
        ("libselinux" ,libselinux)
+       ("pcre" ,pcre)
+       ("util-linux" ,util-linux "lib")
        ("zlib" ,zlib)))
     (native-search-paths
      ;; This variable is not really "owned" by GLib, but several related
      ;; packages refer to it: gobject-introspection's tools use it as a search
      ;; path for .gir files, and it's also a search path for schemas produced
      ;; by 'glib-compile-schemas'.
-     (list (search-path-specification
-            (variable "XDG_DATA_DIRS")
-            (files '("share")))
-           ;; To load extra gio modules from glib-networking, etc.
-           (search-path-specification
-            (variable "GIO_EXTRA_MODULES")
-            (files '("lib/gio/modules")))))
+     (list
+      (search-path-specification
+       (variable "XDG_DATA_DIRS")
+       (files '("share")))
+      ;; To load extra gio modules from glib-networking, etc.
+      (search-path-specification
+       (variable "GIO_EXTRA_MODULES")
+       (files '("lib/gio/modules")))))
     (search-paths native-search-paths)
     (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
     (description
diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/packages/patches/glib-disable-failing-tests.patch
new file mode 100644
index 0000000000..3601c42030
--- /dev/null
+++ b/gnu/packages/patches/glib-disable-failing-tests.patch
@@ -0,0 +1,84 @@
+From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@HIDDEN>
+Date: Tue, 9 Jun 2020 05:17:53 -0400
+Subject: [PATCH] PATCH: Disable failing tests.
+
+---
+ gio/tests/meson.build  | 19 -------------------
+ glib/tests/meson.build |  2 --
+ 2 files changed, 21 deletions(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index c7c3e3035..6e38eb39e 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -34,7 +34,6 @@ gio_tests = {
+   'buffered-output-stream' : {},
+   'cancellable' : {},
+   'contexts' : {},
+-  'contenttype' : {},
+   'converter-stream' : {},
+   'credentials' : {},
+   'data-input-stream' : {},
+@@ -78,7 +77,6 @@ gio_tests = {
+   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
+-  'gdbus-address-get-session' : {},
+   'win32-appinfo' : {},
+ }
+ 
+@@ -135,10 +133,6 @@ endif
+ if host_machine.system() != 'windows'
+   gio_tests += {
+     'file' : {},
+-    'gdbus-peer' : {
+-      'dependencies' : [libgdbus_example_objectmanager_dep],
+-      'install_rpath' : installed_tests_execdir
+-    },
+     'gdbus-peer-object-manager' : {},
+     'live-g-file' : {},
+     'socket-address' : {},
+@@ -173,19 +167,6 @@ if host_machine.system() != 'windows'
+     }
+   endif
+ 
+-  # Uninstalled because of the check-for-executable logic in DesktopAppInfo
+-  # unable to find the installed executable
+-  if not glib_have_cocoa
+-    gio_tests += {
+-      'appinfo' : {
+-        'install' : false,
+-      },
+-      'desktop-app-info' : {
+-        'install' : false,
+-      },
+-    }
+-  endif
+-
+   test_extra_programs += {
+     'basic-application' : {},
+     'dbus-launch' : {},
+diff --git a/glib/tests/meson.build b/glib/tests/meson.build
+index 8da477d19..9fa24dd49 100644
+--- a/glib/tests/meson.build
++++ b/glib/tests/meson.build
+@@ -103,7 +103,6 @@ glib_tests = {
+   'utf8-pointer' : {},
+   'utf8-validate' : {},
+   'utf8-misc' : {},
+-  'utils' : {},
+   'unicode' : {},
+   'uri' : {},
+   '1bit-mutex' : {},
+@@ -151,7 +150,6 @@ if host_machine.system() == 'windows'
+ else
+   glib_tests += {
+     'include' : {},
+-    'unix' : {},
+   }
+   if have_rtld_next
+     glib_tests += {
+-- 
+2.26.2
+
diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch
deleted file mode 100644
index e37425c0c8..0000000000
--- a/gnu/packages/patches/glib-tests-timer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* On i686 floating-point roundoff errors could sometimes cause this check to
-  fail depending on the elapsed microseconds.  Improve rounding by adding a
-  fractional bit.
-
---- glib-2.40.0/glib/tests/timer.c	2014-03-05 08:05:42.000000000 -0600
-+++ glib-2.40.0/glib/tests/timer.c	2014-07-10 16:33:12.746862822 -0500
-@@ -35,7 +35,7 @@
-   elapsed = g_timer_elapsed (timer, &micros);
- 
-   g_assert_cmpfloat (elapsed, <, 1.0);
--  g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000);
-+  g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000);
- 
-   g_timer_destroy (timer);
- }
-- 
2.28.0


--------------50BA6B1176403916C0EC24C7
Content-Type: text/x-patch; charset=UTF-8;
 name="0011-gnu-glib-Update-synopsis-and-description.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0011-gnu-glib-Update-synopsis-and-description.patch"

From 2976c0ac467b692da996332f719df3abf90c2a9e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 08:16:48 -0400
Subject: [PATCH 11/11] gnu: glib: Update synopsis and description.

* gnu/packages/glib.scm (glib) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/glib.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index be5d45596d..2cda6cd000 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -279,12 +279,11 @@ shared NFS home directories.")
        (variable "GIO_EXTRA_MODULES")
        (files '("lib/gio/modules")))))
     (search-paths native-search-paths)
-    (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
-    (description
-     "GLib provides data structure handling for C, portability wrappers,
-and interfaces for such runtime functionality as an event loop, threads,
-dynamic loading, and an object system.")
-    (home-page "https://developer.gnome.org/glib/")
+    (synopsis "Low-level core library for GNOME projects")
+    (description "GLib provides data structure handling for C, portability
+wrappers, and interfaces for such runtime functionality as an event loop,
+threads, dynamic loading, and an object system.")
+    (home-page "https://wiki.gnome.org/Projects/GLib")
     (license license:lgpl2.1+)))
 
 (define-public glib-with-documentation
-- 
2.28.0


--------------50BA6B1176403916C0EC24C7--





Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:27:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:27:47 2020
Received: from localhost ([127.0.0.1]:38838 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQLj-0006wi-D8
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:27:47 -0400
Received: from knopi.disroot.org ([178.21.23.139]:32984)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLQLi-0006wb-9b
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:27:46 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 85FD551BEB
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 14:27:45 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id TE-927MbuwZf for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 14:27:43 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600950463; bh=fGpgvU4QcIIkJ8UFCfCPHU/2JMeqHDhydCb98iLxwIE=;
 h=To:From:Subject:Date;
 b=OQ18bWGvHjOPXzuqrfDxr62PyI7Qy5FVRGp6iOzVMaM3mHLq5P387uOcE5x2b3hom
 bJNvu4XPYbr6EnkyJyrqkxTH4vW5++oRr5ytEZMYuuRQoA/upkAY4uG4T4C8/fG+Lw
 TVHAzSMqChUvhl1XTwgieuKOSO114gXTsbd4QGH+j38RgiOKZofDDrjbz5GlPv+0D5
 Sdzuuw1Oi9rKS5KGEDKH7Bl73VJpJQMarTrUE5E4QBHETWZ8aYSlQE1bN4zJQaLNN3
 gLBxwBtre+U0eiPDUYsdt8z0w29MIj3PEVW39A+OOpbZ6ACvG3NjBIf1ISzUcTYnoG
 gS4cCsaXoHRgg==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 02/29] gnu: yelp-tools: Update package
 definition.
Message-ID: <bf747f9e-0d6e-6f2f-4535-4e8060742960@HIDDEN>
Date: Thu, 24 Sep 2020 08:27:42 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------82D4D5B30775EF7DF1D0A35E"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------82D4D5B30775EF7DF1D0A35E
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------82D4D5B30775EF7DF1D0A35E
Content-Type: text/x-patch; charset=UTF-8;
 name="0006-gnu-yelp-tools-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0006-gnu-yelp-tools-Make-some-cosmetic-changes.patch"

From 23ecff1ec2c70f5d6e5b306a7a6c991b3c5d0e03 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:14:35 -0400
Subject: [PATCH 06/11] gnu: yelp-tools: Make some cosmetic changes.

* gnu/packages/gnome.scm (yelp-tools): Make some cosmetic changes.
---
 gnu/packages/gnome.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d6a807dfa9..a4b88105be 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6521,31 +6521,31 @@ freedesktop.org help system specification.")
   (package
     (name "yelp-tools")
     (version "3.32.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("yelp-xsl" ,yelp-xsl)))
     (propagated-inputs
-     ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
      `(("itstool" ,itstool)
        ("xmllint" ,libxml2)
        ("xsltproc" ,libxslt)))
-    (inputs
-     `(("yelp-xsl" ,yelp-xsl)))
-    (home-page "https://wiki.gnome.org/Apps/Yelp/Tools")
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
 manage, and publish documentation for Yelp and the web.  Most of the heavy
 lifting is done by packages like yelp-xsl and itstool.  This package just
 wraps things up in a developer-friendly way.")
+    (home-page "https://wiki.gnome.org/Apps/Yelp/Tools")
     (license license:gpl2+)))
 
 (define-public libgee
-- 
2.28.0


--------------82D4D5B30775EF7DF1D0A35E
Content-Type: text/x-patch; charset=UTF-8;
 name="0007-gnu-yelp-tools-De-propagate-some-inputs.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0007-gnu-yelp-tools-De-propagate-some-inputs.patch"

From d88a41e2c29aeaa2895b57b4c44f81ab6f4daa70 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:17:52 -0400
Subject: [PATCH 07/11] gnu: yelp-tools: De-propagate some inputs.

* gnu/packages/gnome.scm (yelp-tools) [propagated-inputs]: Move itstool, libxml2 and libxslt to ...
[native-inputs]: ... here.
---
 gnu/packages/gnome.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a4b88105be..3f211e0de6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6532,13 +6532,12 @@ freedesktop.org help system specification.")
         (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("yelp-xsl" ,yelp-xsl)))
-    (propagated-inputs
      `(("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
        ("xmllint" ,libxml2)
        ("xsltproc" ,libxslt)))
+    (inputs
+     `(("yelp-xsl" ,yelp-xsl)))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.28.0


--------------82D4D5B30775EF7DF1D0A35E
Content-Type: text/x-patch; charset=UTF-8;
 name="0008-gnu-yelp-tools-Update-synopsis-and-description.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0008-gnu-yelp-tools-Update-synopsis-and-description.patch"

From 0305b57724002260954b3c95b7932e93980f77c0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:19:55 -0400
Subject: [PATCH 08/11] gnu: yelp-tools: Update synopsis and description.

* gnu/packages/gnome.scm (yelp-tools) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3f211e0de6..5b7df6ab1d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6538,12 +6538,9 @@ freedesktop.org help system specification.")
        ("xsltproc" ,libxslt)))
     (inputs
      `(("yelp-xsl" ,yelp-xsl)))
-    (synopsis "Yelp documentation tools")
-    (description
-     "Yelp-tools is a collection of scripts and build utilities to help create,
-manage, and publish documentation for Yelp and the web.  Most of the heavy
-lifting is done by packages like yelp-xsl and itstool.  This package just
-wraps things up in a developer-friendly way.")
+    (synopsis "Tools for Yelp")
+    (description "Yelp-Tools contains small programs that help you create, edit,
+manage, and publish your Mallard or DocBook documentation.")
     (home-page "https://wiki.gnome.org/Apps/Yelp/Tools")
     (license license:gpl2+)))
 
-- 
2.28.0


--------------82D4D5B30775EF7DF1D0A35E--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:26:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 08:26:32 2020
Received: from localhost ([127.0.0.1]:38833 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLQKV-0006ur-S2
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:26:32 -0400
Received: from knopi.disroot.org ([178.21.23.139]:57384)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1kLQKT-0006uh-4g
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 08:26:30 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 9A6BC51C43
 for <42958 <at> debbugs.gnu.org>; Thu, 24 Sep 2020 14:26:27 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id z95nQdR4vee5 for <42958 <at> debbugs.gnu.org>;
 Thu, 24 Sep 2020 14:26:25 +0200 (CEST)
To: 42958 <at> debbugs.gnu.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1600950385; bh=rTlpkFUFKdPZdh9BbC1h0yxHsE+OCZh4FizVzoKnk3U=;
 h=To:From:Subject:Date;
 b=A1KaDpBeMNxl4hxjuYdAsA00F5Yzr+o9Pblyp4+eHx99TqKBzhWmZhaT7L5sV360S
 mxDQY7DYnpqvJNtowhpeLZklt4kjyykno2WMNBX0QU2grdV1eu6d6wknI3tSQP15zf
 abn8X5NShn14otslHJqncFExwDlQLUpxa8pwdxY1uyzWjSvb+zm1LeH69FoUOi1sCQ
 q0/9/NpRbu3ym7XpL00TV/G6UxyLp1FsbkHc4FAzJWwWe3B8SRq7YrpXY1xX5uwQEU
 rb4Qbr10Jd+5+GTmd02/lpDRr5J6kHQ5tWQisKXy2RWfAldd4618VmZ8rRWZ24+T6O
 qwJolhT+yXflQ==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: Re: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package
 definition.
Message-ID: <1b553328-6cdc-ab8d-1ea5-f046ac3d3e95@HIDDEN>
Date: Thu, 24 Sep 2020 08:26:24 -0400
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------3625450B66D6490F6836C124"
Content-Language: en-US
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This is a multi-part message in MIME format.
--------------3625450B66D6490F6836C124
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

@Danny

Please find the attached split patches.

Regards,
RG.

--------------3625450B66D6490F6836C124
Content-Type: text/x-patch; charset=UTF-8;
 name="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch"

From c52b87ec16822fb3cea3b8937c9bc7042e1553b8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:02:14 -0400
Subject: [PATCH 01/11] gnu: yelp-xsl: Make some cosmetic changes.

* gnu/packages/gnome.scm (yelp-xsl): Make some cosmetic changes.
---
 gnu/packages/gnome.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bc0a4e859e..eca2d74f71 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6445,24 +6445,25 @@ of running programs and invoke methods on those interfaces.")
   (package
     (name "yelp-xsl")
     (version "3.34.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gettext-minimal" ,gettext-minimal)
        ("itstool" ,itstool)
        ("xmllint" ,libxml2)))
-    (home-page "https://wiki.gnome.org/Apps/Yelp")
     (synopsis "XSL stylesheets for Yelp")
     (description
      "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser
 to format Docbook and Mallard documents.")
+    (home-page "https://wiki.gnome.org/Apps/Yelp")
     (license license:gpl2+)))
 
 (define-public yelp
-- 
2.28.0


--------------3625450B66D6490F6836C124
Content-Type: text/x-patch; charset=UTF-8;
 name="0002-gnu-yelp-xsl-Update-to-3.36.0.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0002-gnu-yelp-xsl-Update-to-3.36.0.patch"

From bd5e10ef62b19933b03c2263f99eb83523ccaca4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:04:27 -0400
Subject: [PATCH 02/11] gnu: yelp-xsl: Update to 3.36.0.

* gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0.
[source]<origin>[sha256]: Modify base32.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eca2d74f71..8418fd91ed 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6444,7 +6444,7 @@ of running programs and invoke methods on those interfaces.")
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "3.34.2")
+    (version "3.36.0")
     (source
      (origin
        (method url-fetch)
@@ -6453,7 +6453,7 @@ of running programs and invoke methods on those interfaces.")
                        (version-major+minor version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))))
+        (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gettext-minimal" ,gettext-minimal)
-- 
2.28.0


--------------3625450B66D6490F6836C124
Content-Type: text/x-patch; charset=UTF-8;
 name="0003-gnu-yelp-xsl-Enable-documentation.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0003-gnu-yelp-xsl-Enable-documentation.patch"

From 17bb39d17b1585bfb98b1b6d2fbbe718784eeb0d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:08:12 -0400
Subject: [PATCH 03/11] gnu: yelp-xsl: Enable documentation.

* gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag>[--enable-doc]: New flag.
[native-inputs]: Add mallard-ducktype, intltool and libxslt.
---
 gnu/packages/gnome.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8418fd91ed..987ac895b7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6455,10 +6455,17 @@ of running programs and invoke methods on those interfaces.")
        (sha256
         (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--enable-doc")))
     (native-inputs
-     `(("gettext-minimal" ,gettext-minimal)
+     `(("ducktype" ,mallard-ducktype)
+       ("gettext-minimal" ,gettext-minimal)
+       ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("xmllint" ,libxml2)))
+       ("xmllint" ,libxml2)
+       ("xsltproc" ,libxslt)))
     (synopsis "XSL stylesheets for Yelp")
     (description
      "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser
-- 
2.28.0


--------------3625450B66D6490F6836C124
Content-Type: text/x-patch; charset=UTF-8;
 name="0004-gnu-yelp-xsl-Update-description.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0004-gnu-yelp-xsl-Update-description.patch"

From 46e64da9a742a845b690b09fbb976573ff7302b0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:09:42 -0400
Subject: [PATCH 04/11] gnu: yelp-xsl: Update description.

* gnu/packages/gnome.scm (yelp-xsl) [description]: Modify.
---
 gnu/packages/gnome.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 987ac895b7..9903fd85b3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6467,9 +6467,12 @@ of running programs and invoke methods on those interfaces.")
        ("xmllint" ,libxml2)
        ("xsltproc" ,libxslt)))
     (synopsis "XSL stylesheets for Yelp")
-    (description
-     "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser
-to format Docbook and Mallard documents.")
+    (description "Yelp-XSL is a collection of programs and data files to help
+you build, maintain, and distribute documentation.  It provides XSLT stylesheets
+that can be built upon for help viewers and publishing systems.  These
+stylesheets output JavaScript and CSS content, and reference images
+provided by yelp-xsl. It also redistributes copies of the jQuery and
+jQuery.Syntax JavaScript libraries.")
     (home-page "https://wiki.gnome.org/Apps/Yelp")
     (license license:gpl2+)))
 
-- 
2.28.0


--------------3625450B66D6490F6836C124
Content-Type: text/x-patch; charset=UTF-8;
 name="0005-gnu-yelp-xsl-Update-license.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0005-gnu-yelp-xsl-Update-license.patch"

From 994119569069ca88d225b44221b0f50bb61d21b0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Date: Thu, 24 Sep 2020 04:11:14 -0400
Subject: [PATCH 05/11] gnu: yelp-xsl: Update license.

* gnu/packages/gnome.scm (yelp-xsl) [license]: Add lgpl2.1+ and expat.
---
 gnu/packages/gnome.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9903fd85b3..d6a807dfa9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6474,7 +6474,14 @@ stylesheets output JavaScript and CSS content, and reference images
 provided by yelp-xsl. It also redistributes copies of the jQuery and
 jQuery.Syntax JavaScript libraries.")
     (home-page "https://wiki.gnome.org/Apps/Yelp")
-    (license license:gpl2+)))
+    (license
+     (list
+      ;; XSLT
+      license:gpl2+
+      ;; Images
+      license:lgpl2.1+
+      ;; JavaScript
+      license:expat))))
 
 (define-public yelp
   (package
-- 
2.28.0


--------------3625450B66D6490F6836C124--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 11:36:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 24 07:36:49 2020
Received: from localhost ([127.0.0.1]:38740 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kLPYP-0005jD-1M
	for submit <at> debbugs.gnu.org; Thu, 24 Sep 2020 07:36:49 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:54992)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kLPYL-0005j2-ID
 for 42958 <at> debbugs.gnu.org; Thu, 24 Sep 2020 07:36:47 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C13E63368196;
 Thu, 24 Sep 2020 13:36:43 +0200 (CEST)
Date: Thu, 24 Sep 2020 13:36:20 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Message-ID: <20200924133620.2ceea7d8@HIDDEN>
In-Reply-To: <20200923154552.24020f49@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-5-dannym@HIDDEN>
 <20200923154012.3c206bbd@HIDDEN>
 <20200923154552.24020f49@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sLGHhiMOHJ2NrMaY4nd/jOV";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/sLGHhiMOHJ2NrMaY4nd/jOV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

I think doctool should not be included in gobject-introspection itself, so =
this
patchset is unaffected by it.

--Sig_/sLGHhiMOHJ2NrMaY4nd/jOV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9shLQACgkQ5xo1VCww
uqVamwf8C37SnmZIMjBrJZEpXqSSD+s3BouwQlAxa8R86xVccHHMtFohEF359MSy
ocEtkz0+s9GVV4kk8sOiYp6HC9VvqAK0Yu1CBzZJa9kUqp5EenqKTJkuSbJm3hL2
up2E91Pvj+VgkWNVsTDSiuD5rrKo+PgnTgjxln7Nq+Jt8z4sTsnViQ7nwyBuhMFr
azQCtX4vv/PS9bvx4grgGEDc85+NtYl/Uj5WB0hRWW8Fxricsy18aZogBdBTuR/g
VD5L9Pnbe9SfF2ZR4XBbvXTi5dr68zmiwms4UdRrJHHS+ZXfYbCrh1HDGaJcC4+H
VcMspMlzr0/fh4nFirngnR/HL9Yq5Q==
=kQMh
-----END PGP SIGNATURE-----

--Sig_/sLGHhiMOHJ2NrMaY4nd/jOV--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 23 Sep 2020 13:46:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 23 09:46:17 2020
Received: from localhost ([127.0.0.1]:34888 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kL569-0003ou-Kj
	for submit <at> debbugs.gnu.org; Wed, 23 Sep 2020 09:46:17 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:52568)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kL568-0003on-IF
 for 42958 <at> debbugs.gnu.org; Wed, 23 Sep 2020 09:46:17 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 4902833612A7;
 Wed, 23 Sep 2020 15:46:15 +0200 (CEST)
Date: Wed, 23 Sep 2020 15:45:52 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Message-ID: <20200923154552.24020f49@HIDDEN>
In-Reply-To: <20200923154012.3c206bbd@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-5-dannym@HIDDEN>
 <20200923154012.3c206bbd@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/G5=i2IJqaEiiDKTB7CIotFC";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/G5=i2IJqaEiiDKTB7CIotFC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

On Wed, 23 Sep 2020 15:40:12 +0200
Danny Milosavljevic <dannym@HIDDEN> wrote:

> TODO: Enable meson flag "doctool" (and store it in an extra output maybe,
> depending on how big it is).  Maybe create extra package
> "gobject-introspection-doctool" if it's too big.

That would require python-mako, python-markdown.

--Sig_/G5=i2IJqaEiiDKTB7CIotFC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9rUZAACgkQ5xo1VCww
uqX+wAgAoluXpISy1ldlgKAVIUMZbZKlGAvYTavm63NZE7whOajGg7URd1swv8sd
eZq3oiCpFNG27xixFhnq5dahrqCLiEucF4YtUEq3ewYB5FgXc0ZKAqXNeyPxWkt4
YtcLMhicmA4qiTlrxNYB1B3mI2Lax1erLGMZTT8eTEc4dWb1BVrlJx3Twsc8PYRS
zOkO9JLMnwZf+VwFx2+3QyjVrQn/Vfoh2qug5kFkbGnPMTS5ecQOqC6aiGxLwyx+
ICllB2Uia73U2lyGDnEDIvL07Dp1zDopzpPr+NsQQnO1Shtbp/nay9OLdPvwoBIh
2Rs11m4cgweMAWLqiZbyfybPI9i+qw==
=MYaF
-----END PGP SIGNATURE-----

--Sig_/G5=i2IJqaEiiDKTB7CIotFC--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 23 Sep 2020 13:41:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 23 09:41:12 2020
Received: from localhost ([127.0.0.1]:34880 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kL51D-0003dd-Rl
	for submit <at> debbugs.gnu.org; Wed, 23 Sep 2020 09:41:12 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:52146)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kL518-0003dL-P6
 for 42958 <at> debbugs.gnu.org; Wed, 23 Sep 2020 09:41:09 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C62C73364118;
 Wed, 23 Sep 2020 15:41:04 +0200 (CEST)
Date: Wed, 23 Sep 2020 15:40:12 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Message-ID: <20200923154012.3c206bbd@HIDDEN>
In-Reply-To: <20200820151050.9529-5-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-5-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3PDRgMcQgo7CvtYZv9dsDET";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/3PDRgMcQgo7CvtYZv9dsDET
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

TODO: Enable meson flag "doctool" (and store it in an extra output maybe,
depending on how big it is).  Maybe create extra package
"gobject-introspection-doctool" if it's too big.


--Sig_/3PDRgMcQgo7CvtYZv9dsDET
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9rUDwACgkQ5xo1VCww
uqVxrwf/YknL0mBFbn/Vo5M/iYFruySFpfT2ZbmHRpi/fraEEWDtJoIwGfZflYp+
yjjb1ANNItKqk+0FwJ9YV62T5dA/J6/QjiC+4u3x6flzXUTnUqkIfG6UGs6QfDS7
WmJDSsOhDdo97UsBq8Rs3bhpGMYMs5cf8qYDfNnbUNoG3f2SDHV1pJiBUNSDu0UJ
9EBf8HNvMGrm/MOgQijPQ6GlhBV3jLL7NtIPTTW4GADtFEL/bPaae0VBaI043xjL
w3NlzvcThfA43mbn7/JqvGoosSBS2/c//YcSbPppcalJteJLtrG1NPOf+gzxThu+
hNJ8Reym3t82DTVkGTS8ra/KlBMgdQ==
=WIws
-----END PGP SIGNATURE-----

--Sig_/3PDRgMcQgo7CvtYZv9dsDET--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 30 Aug 2020 20:54:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 30 16:54:33 2020
Received: from localhost ([127.0.0.1]:50840 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kCULR-00077A-CN
	for submit <at> debbugs.gnu.org; Sun, 30 Aug 2020 16:54:33 -0400
Received: from eggs.gnu.org ([209.51.188.92]:38908)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1kCULQ-00076q-AZ
 for 42958 <at> debbugs.gnu.org; Sun, 30 Aug 2020 16:54:32 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e]:44999)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ludo@HIDDEN>)
 id 1kCULK-0005eW-FA; Sun, 30 Aug 2020 16:54:26 -0400
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43790 helo=ribbon)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <ludo@HIDDEN>)
 id 1kCULJ-0008Vt-3e; Sun, 30 Aug 2020 16:54:26 -0400
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Danny Milosavljevic <dannym@HIDDEN>
Subject: Re: [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: Update
 package definition.
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-2-dannym@HIDDEN>
Date: Sun, 30 Aug 2020 22:54:22 +0200
In-Reply-To: <20200820151050.9529-2-dannym@HIDDEN> (Danny
 Milosavljevic's message of "Thu, 20 Aug 2020 17:10:23 +0200")
Message-ID: <87y2lvg8ht.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>, 42958 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi!

Danny Milosavljevic <dannym@HIDDEN> skribis:

> From: Raghav Gururajan <raghavgururajan@HIDDEN>
>
> * gnu/packages/gnome.scm (yelp-tools): Update package definition.
> [propagated-inputs]: Move itstool, libxml2 and libxslt to ...
> [native-inputs]: ... here.
> [synopsis]: Modify.
> [description]: Modify.
>
> Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>

I think =E2=80=9CUpdate package definition=E2=80=9D is not descriptive: it =
should be
either =E2=80=9CUpdate to 3.36=E2=80=9D (for a version update), or =E2=80=
=9CMove build-time tool
to 'native-inputs'=E2=80=9D, or =E2=80=9CTweak synopsis and description=E2=
=80=9D.  But then,
these are different kinds of changes (I know, you=E2=80=99ll hate me for
suggesting another rebase=E2=80=A6).  I find it important to clearly commun=
icate
among us what a change does.

WDYT?

Also, while it=E2=80=99s maybe more convenient for Outreachy, I think many =
of
these changes could have gone one by one on =E2=80=98master=E2=80=99 over t=
ime, like
Raghav used to do.  That avoids the pressure associated with a 29-patch
review.

> +    (synopsis "Tools for Yelp")
> +    (description "Yelp-Tools contains small programs that help you creat=
e, edit,
> +manage, and publish your Mallard or DocBook documentation.")
>      (home-page "https://wiki.gnome.org/Apps/Yelp/Tools")
> -    (synopsis "Yelp documentation tools")
> -    (description
> -     "Yelp-tools is a collection of scripts and build utilities to help =
create,
> -manage, and publish documentation for Yelp and the web.  Most of the hea=
vy
> -lifting is done by packages like yelp-xsl and itstool.  This package just
> -wraps things up in a developer-friendly way.")

This particular change is questionable IMO.

Anyhow, thanks to the two of you for all the work!

Ludo=E2=80=99.




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 24 Aug 2020 00:20:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 23 20:20:00 2020
Received: from localhost ([127.0.0.1]:55374 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kA0DQ-0005vN-Ea
	for submit <at> debbugs.gnu.org; Sun, 23 Aug 2020 20:20:00 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:52248)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1kA0DO-0005vG-Sf
 for 42958 <at> debbugs.gnu.org; Sun, 23 Aug 2020 20:19:59 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 0C13C33602E1;
 Mon, 24 Aug 2020 02:19:58 +0200 (CEST)
Date: Mon, 24 Aug 2020 02:19:56 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package
 definition.
Message-ID: <20200824021956.6ab8cdd2@HIDDEN>
In-Reply-To: <20200820151050.9529-12-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-12-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jVQZPcujPDUh//xzFSYI9gx";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/jVQZPcujPDUh//xzFSYI9gx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Should be "/xml/xsl/docbook-xsl-1.79.2/" instead of "/xml/xsl/docbook-xsl-1=
.79.1/", otherwise fails with:

FAILED: docs/gdk-pixbuf-csource.1=20

/gnu/store/8mcjhrc6yir9gzrp0y71nj254giw75bd-libxslt-1.1.34/bin/xsltproc --n=
onet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style an=
si --stringparam man.th.extra1.suppress 1 --stringparam man.authors.section=
.enabled 0 --stringparam man.copyright.section.enabled 0 -o docs/gdk-pixbuf=
-csource.1 /gnu/store/6jxdry6q9yj4rw7ska0aniqjf42b6ply-docbook-xsl-1.79.2/x=
ml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl ../gdk-pixbuf-2.40.0/docs/gd=
k-pixbuf-csource.xml
warning: failed to load external entity "/gnu/store/6jxdry6q9yj4rw7ska0aniq=
jf42b6ply-docbook-xsl-1.79.2/xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xs=
l"
cannot parse /gnu/store/6jxdry6q9yj4rw7ska0aniqjf42b6ply-docbook-xsl-1.79.2=
/xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl
[4/152] Compiling C object 'gdk-pixbuf/pixops/a255f19@@timescale@exe/timesc=
ale.c.o'.
[5/152] Generating gdk-pixbuf-enum-types.h with a meson_exe.py custom comma=
nd.
[6/152] Compiling C object 'gdk-pixbuf/pixops/a255f19@@pixops@sta/pixops.c.=
o'.
ninja: build stopped: subcommand failed.
command "ninja" "-j" "4" failed with status 1
builder for `/gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gdk-pixbuf-2.40.0.=
drv' failed with exit code 1
build of /gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gdk-pixbuf-2.40.0.drv =
failed
View build log at '/var/log/guix/drvs/8j/55f3i81w274iif5pnsbyxp170s9814-gdk=
-pixbuf-2.40.0.drv.bz2'.
guix build: error: build of `/gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gd=
k-pixbuf-2.40.0.drv' failed

--Sig_/jVQZPcujPDUh//xzFSYI9gx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9DB6wACgkQ5xo1VCww
uqX6Kwf/RYkC3DlT7mfDrR/p6H8FVaRhL7MmlNYqt90yfTAlPnXUGxLZ0mRSARdr
gt7+TeQGVjAYgZUgCpXitZdl5GAV6Narnm/y2wV+7Zbh95uvrHybyoqq8dLnuQYG
ZjDuHnYbRF+QnZzT/bqrfjXtFW7G1B03TkbTAaTUwJSbJPK2/76hWSeTuoVcQU4k
7hM92gyK6OkZcQZEzyQ3ExksDStRfYBLmQR4N2ubHULybJPyEeXL7copxPH1ZDQF
jSXDV5oA04So3bSGWyZBsuI8GPDfn6jI1nDsSbB6Ebk53mv/pQ8h5D4D4FYFO8AT
xnsEOCr1F5VKqOnS2iSrek6qjxI1zg==
=TceB
-----END PGP SIGNATURE-----

--Sig_/jVQZPcujPDUh//xzFSYI9gx--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:48:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:48:17 2020
Received: from localhost ([127.0.0.1]:43812 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8njd-0000lT-Lg
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:48:17 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:50774)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8njc-0000lM-Fd
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:48:16 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id AFCB4336219F;
 Thu, 20 Aug 2020 18:48:15 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:48:14 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Message-ID: <20200820184814.3f7a04db@HIDDEN>
In-Reply-To: <20200820151050.9529-22-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-22-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/OgJjHSokIcjkuiyLh_zdE3U";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/OgJjHSokIcjkuiyLh_zdE3U
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

This uses glibmm-2.64 which is not in guix core-updates yet.

However, glibmm-2.64 has been added to guix master as commit 5173bb55ad4.

--Sig_/OgJjHSokIcjkuiyLh_zdE3U
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qU4ACgkQ5xo1VCww
uqXncQf/ex8Uh0vcQfbCEy4hGOajc6UbvsUbPz71rBnJmVQtVLCBYvpw3iurSxf+
7vOEkhBV6pO6gdSUP6rGteaudtW9eyRet/0GebXQ6XtjSx2mdrTBQC5vrHJY+rFS
BkYsGXfFEzVkKs6+Smugao/hbasbz+7VhADK0Qhk03LDpUKnOF+E69LobGs0yQys
vqSh/+YLcKObKvbm3aNgpfXoxP+AuuePRELALXsD/ifMPA0M4vij7T7nd8GKfTdh
6mhwslUMrVvQ68JlWPh2CKbqp54ZarTbIDUk6+2Z3x5OSnoGC5KRDmDVaLr37c0Y
u63a94JainBfwPOsMLjjOFcuVFrEnA==
=xyNK
-----END PGP SIGNATURE-----

--Sig_/OgJjHSokIcjkuiyLh_zdE3U--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:45:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:45:48 2020
Received: from localhost ([127.0.0.1]:43807 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8nhE-0007dx-Am
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:45:48 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:50564)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8nhD-0007ct-GX
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:45:47 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C2735336219F;
 Thu, 20 Aug 2020 18:45:46 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:45:46 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package
 definition.
Message-ID: <20200820184546.560af1cc@HIDDEN>
In-Reply-To: <20200820151050.9529-9-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-9-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MOHhu.E+Btd1npq3yk8gSdz";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/MOHhu.E+Btd1npq3yk8gSdz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

openjpeg-data is not in guix core-updates yet, but it's in guix master.

guix master commit 3f03bd372871a95e2ebb50197172f7a95329feed added openjpeg-=
data.

--Sig_/MOHhu.E+Btd1npq3yk8gSdz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qLoACgkQ5xo1VCww
uqVZagf+MUmK6ypVs8on+nFalFzvZXAqOtJJRsUqGhS0LnsTwhP0J4/vv1ezbx8h
Q+R5gIg3aXS7O/fBQFWzFtJskJ8dRwI3GwXwkKue6H3DFg+dPFvHE0kBCTXcAeCr
Bvig5/1qgs96Ves1fRrVWaht+r6rvPwaxXSGtAlhyfy46H6OwmYSYKetEpbV0d1T
DONUsuW+w7SxS6FD/xuKPRUvxONo1TqI8sNPFtll1de0k2+fATB5zEpVz0J4pXRj
H0wN3tdAIRN9r7s4zgfdUj4GoL8l0conGjLBN0ehuzJkk4UHRBm9EedK2PkejERU
qPbT6iDt9P1/gtNj4hMCAuyAUUsxOA==
=MKhJ
-----END PGP SIGNATURE-----

--Sig_/MOHhu.E+Btd1npq3yk8gSdz--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:45:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:45:04 2020
Received: from localhost ([127.0.0.1]:43804 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8ngV-0006ww-W5
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:45:04 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:50430)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8ngU-0006uK-Bz
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:45:02 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 8E28C336219F;
 Thu, 20 Aug 2020 18:45:01 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:45:00 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Message-ID: <20200820184500.26ace660@HIDDEN>
In-Reply-To: <20200820151050.9529-22-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-22-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cMGr5JA_d9rIWTkhpGHvti5";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/cMGr5JA_d9rIWTkhpGHvti5
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

missing import (gnu packages graphviz)

--Sig_/cMGr5JA_d9rIWTkhpGHvti5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qIwACgkQ5xo1VCww
uqUiqwf8CFby8jsq9ujbG96+U0wcMIAElxnf2m2fdI6iXkFZJ/DPYNBP+eZyAraq
Q+dw8tmSAm1dfuTUb0dc2l/nJiuaplpxv9VrDB0BWrUmtktEqlOaBOn9hMj9yOyZ
RiI4NThKn+XoKBIk7xVXDO3NnjR7Z4BuXqEHbY/ZL7x6l7S+ybdopeRVsU+sNrDR
ZJ42ZXOE8i9X0wtPSXfUwJu7MeMCn+pDR5fwCfuW4r4Sxn7vTYIsVy2Yasu3EuwC
y8AmlF4JiZ8sya9lfzTQ0aJuLtWPn/pmkB2MCa/WlkbOCAFzfNEACK6KLXgcCQVA
69dNZkG0G4dFXEEdcnf6yeJQ93RwTA==
=f2ys
-----END PGP SIGNATURE-----

--Sig_/cMGr5JA_d9rIWTkhpGHvti5--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:44:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:44:47 2020
Received: from localhost ([127.0.0.1]:43800 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8ngE-0006tb-Mz
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:44:46 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:50404)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8ngC-0006tS-LS
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:44:45 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 0D776336219F;
 Thu, 20 Aug 2020 18:44:43 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:44:41 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 27/29] gnu: gtk+: Update package definition.
Message-ID: <20200820184441.6c970ada@HIDDEN>
In-Reply-To: <20200820151050.9529-27-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-27-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hCehJ17vJ+vYLsdlAK4cRqZ";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/hCehJ17vJ+vYLsdlAK4cRqZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

libcloudprovider is not in guix core-updates yet.

guix master commit that added libcloudprovider is
63d71ff0061c2e761fbad6e67f322208d8fdf25b.

--Sig_/hCehJ17vJ+vYLsdlAK4cRqZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qHkACgkQ5xo1VCww
uqUzrgf+OgXehu0lFwMfSAj8MfvMZNivCtAUVl91e8LNIIXONAunKUGRrWcUI5v0
5nFk65/wLKDkKHXi026pp1lnLluFs5zTsMnz4PWLXDATAJ+FGtQ+V6yyhLikLFWa
Wxc8zhole+txNbtlRwOnTZcJwzVf0pXSaaFjBkyjJkdcAghp2lEZ/X7ke8vQH4dP
33lqbWQvH/80MPlftiFfdhrazzzh8n13s9cwUVmCLwjxVvVZKfaqSa0azFM6RxBM
oKmCXLJxJuSkKpo4NMmcbnzsUkmB5JsYchAD2iXXmAm+BTW27zlrrYkfkC/NDkqU
V3AV0R3fuyDQATmXll9EHIrD11lhkg==
=SLfG
-----END PGP SIGNATURE-----

--Sig_/hCehJ17vJ+vYLsdlAK4cRqZ--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:29:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:29:45 2020
Received: from localhost ([127.0.0.1]:43704 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8nRg-0006Q4-Vt
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:29:45 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:49090)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8nRf-0006Pw-AL
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:29:43 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 9CDE7336219F;
 Thu, 20 Aug 2020 18:29:42 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:29:41 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Message-ID: <20200820182941.327c66f0@HIDDEN>
In-Reply-To: <20200820182756.008c4f62@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-11-dannym@HIDDEN>
 <20200820182756.008c4f62@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/oxcSZ3TMD6Gzzfid=e4A.l1";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/oxcSZ3TMD6Gzzfid=e4A.l1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

libthai requires libdatrie, which is on master as commit 20842b795e2.

--Sig_/oxcSZ3TMD6Gzzfid=e4A.l1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+pPUACgkQ5xo1VCww
uqUbbwgAggT9O3bEkzdRGBKq4ImjyUC/fSA3+bIYk18o63EccLRlKS9X15s9P+LI
yzlg3xm/gqTxsitbbJA6WQ15BEIccntHvu4oZyhAJpFJJYc22u7Ag04+OqnbGp30
4/meptxbVDzmnOmg1d/PIEJFxswIUVJeqGpKqTBoEVJds7S4oRtnnaB+14LTsm4f
ey2YKKRnuvboiOGec8DgokSoLQZzSg3OkE9vBux0ON5785pJfE7WHePKmncAd8Bu
+6jpXMGjBgtvzshkVHwml96VKC7PD6hhfBrlZA8omkHA6/NU2VnvfIHRHzGzBeTc
/NpLlti7HmprSJATnNb6jJSJrR8KGw==
=Kog6
-----END PGP SIGNATURE-----

--Sig_/oxcSZ3TMD6Gzzfid=e4A.l1--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:28:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 12:28:03 2020
Received: from localhost ([127.0.0.1]:43671 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8nQ2-0006Kn-PL
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:28:02 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:48888)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8nQ0-0006KM-9M
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 12:28:01 -0400
Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id D8242336337B;
 Thu, 20 Aug 2020 18:27:57 +0200 (CEST)
Date: Thu, 20 Aug 2020 18:27:56 +0200
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Message-ID: <20200820182756.008c4f62@HIDDEN>
In-Reply-To: <20200820151050.9529-11-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
 <20200820151050.9529-11-dannym@HIDDEN>
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Oca_aK8crOLTOPZVOSyh998";
 protocol="application/pgp-signature"; micalg=pgp-sha512
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--Sig_/Oca_aK8crOLTOPZVOSyh998
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

misses libthai, but that's in master as of 5c57328ef73.


--Sig_/Oca_aK8crOLTOPZVOSyh998
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+pIwACgkQ5xo1VCww
uqVNwwf/dgSaKH7X2a8EokEY2xwDehtmWALPSV3rTJIRTgccNABGW9hu3gLFz3uE
ZZWfuvNmrUis3Lye5Rk4gSSTn601Hk6xmf5oW/LcQ++WNr9uv7ByAQ4hU9CQDblm
rWOWrBiTe6ifvI2Awj/C3D4lV+/zsmVJquhArJPDGzVK34hJgTx4CWMls4aqCPSF
/7dpJBlD9svFouiGRFCzR8J2qpohcf3rxjbwmyp/fgv3y9tNsUNqmDtChzIGxtn6
SdALXOlQvUcpxXl6iyWrOmXOJXa1MwoABlHKwGyBE7W/KDPcwPP+KKRo5i22bfZb
jzjWZEw/OD+UeyZreYKekPxyk2bkBg==
=/OkL
-----END PGP SIGNATURE-----

--Sig_/Oca_aK8crOLTOPZVOSyh998--




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:12:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:12:13 2020
Received: from localhost ([127.0.0.1]:43534 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mEW-0006CS-HL
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:12:13 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42422)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDa-00064v-0H
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:16 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 94CE13368238;
 Thu, 20 Aug 2020 17:11:01 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 26/29] gnu: at-spi2-atk: Update to 2.34.2.
Date: Thu, 20 Aug 2020 17:10:47 +0200
Message-Id: <20200820151050.9529-26-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (at-spi2-atk): Update to 2.34.2.
[version]: Update to 2.34.2.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add gobject-introspection.
[inputs]: Add glib.
[home-page]: Modify.
[license]: Update to lgpl2.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 75 +++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5198754b2c..9b69f788bb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -695,42 +695,45 @@ core components, is part of the GNOME accessibility project.")
 
 (define-public at-spi2-atk
   (package
-   (name "at-spi2-atk")
-   (version "2.34.1")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))))
-   (build-system meson-build-system)
-   (arguments
-    '(#:phases
-      (modify-phases %standard-phases
-        (replace 'check
-                 ;; Run test-suite under a dbus session.
-                 (lambda _
-                   (setenv "DBUS_FATAL_WARNINGS" "0")
-                   (invoke "dbus-launch" "meson" "test"))))))
-   (propagated-inputs
-    ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or
-    ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle.
-    `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
-   (inputs
-    `(("atk" ,atk)))
-   (native-inputs
-    `(("pkg-config" ,pkg-config)
-      ;; For tests.
-      ("dbus" ,dbus)
-      ("libxml2" ,libxml2)))
-   (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
-   (description
-    "The Assistive Technology Service Provider Interface
-is part of the GNOME accessibility project.")
-   (license license:lgpl2.0+)
-   (home-page "https://projects.gnome.org/accessibility/")))
+    (name "at-spi2-atk")
+    (version "2.34.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:glib-or-gtk? #t    ; To wrap binaries and/or compile schemas.
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           ;; Run test-suite under a dbus session.
+           (lambda _
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             (invoke "dbus-launch" "meson" "test"))))))
+    (native-inputs
+     `(("dbus" ,dbus)                ; For tests
+       ("gobject-introspection" ,gobject-introspection)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("atk" ,atk)
+       ("glib" ,glib)))
+    (propagated-inputs
+     ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or
+     ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle.
+     `(("at-spi2-core" ,at-spi2-core)))
+    (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
+    (description "The Assistive Technology Service Provider Interface is part of
+the GNOME accessibility project.")
+    (home-page "https://wiki.gnome.org/Accessibility/")
+    (license license:lgpl2.1+)))
 
 (define-public gtk+-2
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:12:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:12:04 2020
Received: from localhost ([127.0.0.1]:43524 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mEO-0006BD-Se
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:12:04 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42412)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDb-00064f-48
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:12 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C731F3368211;
 Thu, 20 Aug 2020 17:11:00 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 23/29] gnu: gtk-doc: Update package definition.
Date: Thu, 20 Aug 2020 17:10:44 +0200
Message-Id: <20200820151050.9529-23-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output 'help'.
[arguments]<#:configure-flags>[--with-help-dir]: New flag.
<#:phases>['patch-test-out]: Remove phase.
['disable-failing-tests]: New phase.
[native-inputs]: Add glib:bin, perl and python-wrapper.
[inputs]: Add python-anytree, python-lxml, python-parameterized,
python-pygments, python-unittest2 and yelp-tools.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add fdl1.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 124 ++++++++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d595a8c7ec..7e32b7623b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1633,48 +1633,48 @@ information.")
 (define-public gtk-doc
   (package
     (name "gtk-doc")
-    (version "1.28")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))))
-    (build-system gnu-build-system)
+    (version "1.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "help"))
     (arguments
-     `(#:parallel-tests? #f
+     `(#:configure-flags
+       (list
+        (string-append "--with-xml-catalog="
+                       (assoc-ref %build-inputs "docbook-xml")
+                       "/xml/dtd/docbook/catalog.xml")
+        (string-append "--with-help-dir="
+                       (assoc-ref %outputs "help")
+                       "/share/help"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-gtk-doc-scan
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "gtk-doc.xsl"
-              (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
-               (string-append (assoc-ref inputs "docbook-xsl")
-                              "/xml/xsl/docbook-xsl-"
-                              ,(package-version docbook-xsl)
-                              "/html/chunk.xsl"))
-              (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml")
-               (string-append (assoc-ref inputs "docbook-xsl")
-                              "/xml/xsl/docbook-xsl-"
-                              ,(package-version docbook-xsl)
-                              "/common/en.xml")))
+               (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
+                (string-append (assoc-ref inputs "docbook-xsl")
+                               "/xml/xsl/docbook-xsl-"
+                               ,(package-version docbook-xsl)
+                               "/html/chunk.xsl"))
+               (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml")
+                (string-append (assoc-ref inputs "docbook-xsl")
+                               "/xml/xsl/docbook-xsl-"
+                               ,(package-version docbook-xsl)
+                               "/common/en.xml")))
              #t))
-         (add-after 'patch-gtk-doc-scan 'patch-test-out
+         (add-after 'unpack 'disable-failing-tests
            (lambda _
-             ;; sanity.sh counts the number of status lines.  Since our
-             ;; texlive regenerates the fonts every time and the font
-             ;; generator metafont outputs a lot of extra lines, this
-             ;; test would always fail.  Disable it for now.
              (substitute* "tests/Makefile.in"
-              (("empty.sh sanity.sh") "empty.sh"))
-             #t))
-         (add-before 'build 'set-HOME
-           (lambda _
-             ;; FIXME: dblatex with texlive-union does not find the built
-             ;; metafonts, so it tries to generate them in HOME.
-             (setenv "HOME" "/tmp")
+               (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh")
+                ""))
              #t))
          (add-before 'configure 'fix-docbook
            (lambda* (#:key inputs #:allow-other-keys)
@@ -1691,6 +1691,12 @@ information.")
                                                 "^catalog.xml$"))
                                " \"http://docbook.sourceforge.net/release/xsl/")))
              #t))
+         (add-before 'build 'set-HOME
+           (lambda _
+             ;; FIXME: dblatex with texlive-union does not find the built
+             ;; metafonts, so it tries to generate them in HOME.
+             (setenv "HOME" "/tmp")
+             #t))
          (add-after 'install 'wrap-executables
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -1698,34 +1704,44 @@ information.")
                            (wrap-program prog
                              `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
                          (find-files (string-append out "/bin")))
-               #t))))
-       #:configure-flags
-       (list (string-append "--with-xml-catalog="
-                            (assoc-ref %build-inputs "docbook-xml")
-                            "/xml/dtd/docbook/catalog.xml"))))
+               #t))))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("itstool" ,itstool)
-       ("libxml" ,libxml2)
-       ("gettext" ,gettext-minimal)
-       ("bc" ,bc)))
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
     (inputs
-     `(("perl" ,perl)
-       ("python" ,python)
-       ("xsltproc" ,libxslt)
+     `(("bc" ,bc)
        ("dblatex" ,dblatex)
        ("docbook-xml" ,docbook-xml-4.3)
        ("docbook-xsl" ,docbook-xsl)
-       ("source-highlight" ,source-highlight)
        ("glib" ,glib)
-       ("python-six" ,python-six)))
-    (home-page "https://www.gtk.org/gtk-doc/")
-    (synopsis "Documentation generator from C source code")
-    (description
-     "GTK-Doc generates API documentation from comments added to C code.  It is
-typically used to document the public API of GTK+ and GNOME libraries, but it
-can also be used to document application code.")
-    (license license:gpl2+)))
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("python" ,python)
+       ("python-anytree" ,python-anytree)
+       ("python-lxml" ,python-lxml)
+       ("python-parameterized" ,python-parameterized)
+       ("python-pygments" ,python-pygments)
+       ("python-unittest2" ,python-unittest2)
+       ("source-highlight" ,source-highlight)
+       ("yelp-tools" ,yelp-tools)))
+    (synopsis "GTK+ DocBook Documentation Generator")
+    (description "GtkDoc is a tool used to extract API documentation from C-code
+like Doxygen, but handles documentation of GObject (including signals and
+properties) that makes it very suitable for GTK+ apps and libraries.  It uses
+docbook for intermediate files and can produce html by default and pdf/man-pages
+with some extra work.")
+    (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc")
+    (license
+     (list
+      ;; Docs.
+      license:fdl1.1+
+      ;; Others.
+      license:gpl2+))))
 
 (define-public gtk-engines
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:56 2020
Received: from localhost ([127.0.0.1]:43522 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mEO-0006BA-3j
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:56 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42400)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDa-00064K-77
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:10 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 3B2BB3368187;
 Thu, 20 Aug 2020 17:10:59 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 17/29] gnu: librsvg@HIDDEN: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:38 +0200
Message-Id: <20200820151050.9529-17-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (librsvg): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
<#:phases>['patch-docbook]: New phase.
['remove-failing-tests]: Modify phase.
[native-inputs]: Add docbook-xml and python-wrapper.
[inputs]: Add fontconfig, freetype and  harfbuzz.
[synopsis]: Modify.
[description]: Modify.
[license]: Update to lgpl2.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 79 +++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2bc70ec9c3..5c5b67a808 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2320,21 +2320,35 @@ for dealing with different structured file formats.")
   (package
     (name "librsvg")
     (version "2.40.21")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version)  "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
-    (build-system gnu-build-system)
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
      `(#:configure-flags
-       (list "--disable-static"
-             "--enable-vala") ; needed for e.g. gnome-mines
+       (list
+        "--disable-static"
+        "--enable-vala"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "rsvg-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
          (add-before 'configure 'pre-configure
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "gdk-pixbuf-loader/Makefile.in"
@@ -2343,7 +2357,7 @@ for dealing with different structured file formats.")
                (("gdk_pixbuf_moduledir = .*$")
                 (string-append "gdk_pixbuf_moduledir = "
                                "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
-                                "loaders\n"))
+                               "loaders\n"))
                ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
                (("gdk_pixbuf_cache_file = .*$")
                 "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
@@ -2352,37 +2366,38 @@ for dealing with different structured file formats.")
            (lambda _
              (with-directory-excursion "tests/fixtures/reftests"
                (for-each delete-file
-                         '(;; This test fails on i686:
-                           "svg1.1/masking-path-04-b.svg"
-                           ;; This test fails on armhf:
-                           "svg1.1/masking-mask-01-b.svg"
-                           ;; This test fails on aarch64:
+                         '("bugs/340047.svg"
+                           "bugs/587721-text-transform.svg"
+                           "bugs/749415.svg"
                            "bugs/777834-empty-text-children.svg")))
              #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("vala" ,vala)
-       ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-       ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("vala" ,vala)))
     (inputs
-     `(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for
-       ;; this ancient version of librsvg.
-       ("pango" ,pango-1.42)
+     `(("bzip2" ,bzip2)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("harfbuzz" ,harfbuzz)
        ("libcroco" ,libcroco)
-       ("bzip2" ,bzip2)
        ("libgsf" ,libgsf)
-       ("libxml2" ,libxml2)))
+       ("libxml2" ,libxml2)
+       ("pango" ,pango)))
     (propagated-inputs
-     ;; librsvg-2.0.pc refers to all of that.
      `(("cairo" ,cairo)
        ("gdk-pixbuf" ,gdk-pixbuf)
        ("glib" ,glib)))
+    (synopsis "SVG rendering library")
+    (description "Librsvg is a library to render SVG images to Cairo surfaces.
+GNOME uses this to render SVG icons.  Outside of GNOME, other desktop
+environments use it for similar purposes.  Wikimedia uses it for Wikipedia's SVG
+diagrams.")
     (home-page "https://wiki.gnome.org/LibRsvg")
-    (synopsis "Render SVG files using Cairo")
-    (description
-     "Librsvg is a C library to render SVG files using the Cairo 2D graphics
-library.")
-    (license license:lgpl2.0+)))
+    (license license:lgpl2.1+)))
 
 (define-public librsvg-next
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:38 2020
Received: from localhost ([127.0.0.1]:43520 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE2-0006Ab-M1
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:38 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42360)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDW-00063k-W6
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:08 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 69F5C336807F;
 Thu, 20 Aug 2020 17:10:57 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Date: Thu, 20 Aug 2020 17:10:32 +0200
Message-Id: <20200820151050.9529-11-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (pango): Update package definition.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add help2man, perl and python-wrapper.
[propagated-inputs]: Add libthai and libxrender.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
* gnu/packages/patches/pango-skip-libthai-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gtk.scm                          | 99 ++++++++++---------
 .../patches/pango-skip-libthai-test.patch     | 23 -----
 3 files changed, 51 insertions(+), 72 deletions(-)
 delete mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ae708248e8..3732e56acc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1378,7 +1378,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/p7zip-remove-unused-code.patch		\
   %D%/packages/patches/pam-krb5-CVE-2020-10595.patch		\
   %D%/packages/patches/pam-mount-luks2-support.patch		\
-  %D%/packages/patches/pango-skip-libthai-test.patch		\
   %D%/packages/patches/pciutils-hurd-configure.patch		\
   %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch		\
   %D%/packages/patches/sdl-pango-api_additions.patch		\
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2f939ff0bd..c7bc9cf1a4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -74,6 +74,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -240,54 +241,56 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
 
 (define-public pango
   (package
-   (name "pango")
-   (version "1.44.7")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/pango/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (patches (search-patches "pango-skip-libthai-test.patch"))
-            (sha256
-             (base32
-              "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
-   (build-system meson-build-system)
-   (arguments
-    '(#:phases (modify-phases %standard-phases
-                 (add-after 'unpack 'disable-cantarell-tests
-                   (lambda _
-                     (substitute* "tests/meson.build"
-                       ;; XXX FIXME: These tests require "font-cantarell", but
-                       ;; adding it here would introduce a circular dependency.
-                       (("\\[ 'test-harfbuzz'.*") "")
-                       (("\\[ 'test-itemize'.*") "")
-                       (("\\[ 'test-layout'.*") ""))
-                     #t)))))
-   (propagated-inputs
-    ;; These are all in Requires or Requires.private of the '.pc' files.
-    `(("cairo" ,cairo)
-      ("fribidi" ,fribidi)
-      ("fontconfig" ,fontconfig)
-      ("freetype" ,freetype)
-      ("glib" ,glib)
-      ("harfbuzz" ,harfbuzz)
-
-      ;; Some packages, such as Openbox, expect Pango to be built with the
-      ;; optional libxft support.
-      ("libxft" ,libxft)))
-   (inputs
-    `(("zlib" ,zlib)))
-   (native-inputs
-    `(("pkg-config" ,pkg-config)
-      ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-      ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
-   (synopsis "GNOME text and font handling library")
-   (description
-    "Pango is the core text and font handling library used in GNOME
-applications.  It has extensive support for the different writing systems
-used throughout the world.")
-   (license license:lgpl2.0+)
-   (home-page "https://developer.gnome.org/pango/")))
+    (name "pango")
+    (version "1.44.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/pango/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/meson.build"
+               (("\\[ 'test-harfbuzz'.*") "")
+               (("\\[ 'test-itemize'.*") "")
+               (("\\[ 'test-layout'.*") ""))
+             #t)))))
+    (native-inputs
+     `(("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("help2man" ,help2man)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("zlib" ,zlib)))
+    (propagated-inputs
+     `(("cairo" ,cairo)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("fribidi" ,fribidi)
+       ("glib" ,glib)
+       ("harfbuzz" ,harfbuzz)
+       ("libthai" ,libthai)
+       ("libxft" ,libxft)
+       ("libxrender" ,libxrender)))
+    (synopsis "Text and font handling library")
+    (description "Pango is a library for laying out and rendering of text, with
+an emphasis on internationalization.  Pango can be used anywhere that text
+layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit.  Pango forms the core of text and font
+handling for GTK+-2.x.")
+    (home-page "https://pango.gnome.org/")
+    (license license:lgpl2.0+)))
 
 (define-public pango-1.42
   (package
diff --git a/gnu/packages/patches/pango-skip-libthai-test.patch b/gnu/packages/patches/pango-skip-libthai-test.patch
deleted file mode 100644
index 98732b5391..0000000000
--- a/gnu/packages/patches/pango-skip-libthai-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Skip Thai character test when libthai is unavailable.
-
-Taken from upstream bug tracker:
-https://gitlab.gnome.org/GNOME/pango/merge_requests/161
-https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee
-
-diff --git a/tests/test-break.c b/tests/test-break.c
-index 8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b 100644
---- a/tests/test-break.c
-+++ b/tests/test-break.c
-@@ -305,6 +305,12 @@ main (int argc, char *argv[])
-       if (!strstr (name, "break"))
-         continue;
- 
-+#ifndef HAVE_LIBTHAI
-+      /* four.break involves Thai, so only test it when we have libthai */
-+      if (strstr (name, "four.break"))
-+        continue;
-+#endif
-+
-       path = g_strdup_printf ("/break/%s", name);
-       g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
-                                  test_break, g_free);




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:34 2020
Received: from localhost ([127.0.0.1]:43518 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE2-0006AU-Bz
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:34 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42390)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDZ-00064C-LB
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 336433368076;
 Thu, 20 Aug 2020 17:10:58 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 14/29] gnu: gdk-pixbuf+svg: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:35 +0200
Message-Id: <20200820151050.9529-14-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gdk-pixbuf+svg): Update package definition.
[arguments]: Modify.
[synopsis]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4e1145002e..113ee44ad1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -568,10 +568,9 @@ scaled, composited, modified, saved, or rendered.")
      `(("librsvg" ,librsvg)
        ,@(package-inputs gdk-pixbuf)))
     (arguments
-     '(#:configure-flags '("-Dinstalled-tests=false")
-       #:tests? #f ; tested by the gdk-pixbuf package already
-       #:phases
-       (modify-phases %standard-phases
+     (substitute-keyword-arguments (package-arguments gdk-pixbuf)
+        ((#:phases phases)
+          `(modify-phases ,phases
          (add-after 'install 'register-svg-loader
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out     (assoc-ref outputs "out"))
@@ -585,9 +584,8 @@ scaled, composited, modified, saved, or rendered.")
                (apply invoke
                       gdk-pixbuf-query-loaders
                       "--update-cache"
-                      loaders)))))))
-    (synopsis
-     "GNOME image loading and manipulation library, with SVG support")))
+                      loaders))))))))
+    (synopsis "Image loading library, with SVG support")))
 
 (define-public at-spi2-core
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:34 2020
Received: from localhost ([127.0.0.1]:43516 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE2-0006AM-1J
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:34 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42410)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDZ-00064d-4v
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 42FE633681FD;
 Thu, 20 Aug 2020 17:11:00 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 21/29] gnu: wayland-protocols: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:42 +0200
Message-Id: <20200820151050.9529-21-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/freedesktop.scm (wayland-protocols) [version]: Update
to 1.20.
[source]<origin>[sha256]: Modify base32.
[description]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/freedesktop.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 880c006e15..8a2dcfbab7 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -710,22 +710,26 @@ fullscreen) or other display servers.")
 (define-public wayland-protocols
   (package
     (name "wayland-protocols")
-    (version "1.18")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://wayland.freedesktop.org/releases/"
-                    "wayland-protocols-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"))))
+    (version "1.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://wayland.freedesktop.org/releases/"
+         "wayland-protocols-" version ".tar.xz"))
+       (sha256
+        (base32 "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"))))
     (build-system gnu-build-system)
-    (inputs
-     `(("wayland" ,wayland)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("wayland" ,wayland)))
     (synopsis "Wayland protocols")
-    (description "This package contains XML definitions of the Wayland protocols.")
+    (description "Wayland-Protocols contains Wayland protocols that add
+functionality not available in the Wayland core protocol.  Such protocols either
+add completely new functionality, or extend the functionality of some other
+protocol either in Wayland core, or some other protocol in wayland-protocols.")
     (home-page "https://wayland.freedesktop.org")
     (license license:expat)))
 




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:34 2020
Received: from localhost ([127.0.0.1]:43514 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE1-0006AF-OC
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42368)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDY-00063y-2i
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id ECC563368155;
 Thu, 20 Aug 2020 17:10:57 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 13/29] gnu: gdk-pixbuf: Disable failing tests.
Date: Thu, 20 Aug 2020 17:10:34 +0200
Message-Id: <20200820151050.9529-13-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gdk-pixbuf): Disable failing tests.
[arguments]<#:phases>['disable-failing-tests]: New phase.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9af6e73e8a..4e1145002e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -525,7 +525,14 @@ highlighting and other features typical of a source code editor.")
                  (("http://www.oasis-open.org/docbook/xml/4.3/")
                   (string-append (assoc-ref inputs "docbook-xml")
                                  "/xml/dtd/docbook/"))))
-             #t)))))
+             #t))
+         (add-before 'configure 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/meson.build"
+               (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],")
+                ""))
+             #t))
+         )))
     (native-inputs
      `(("docbook-xml" ,docbook-xml-4.3)
        ("docbook-xsl" ,docbook-xsl)




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:33 2020
Received: from localhost ([127.0.0.1]:43512 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE1-0006A7-5D
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42354)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDW-00063h-Lg
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id D69C43368278;
 Thu, 20 Aug 2020 17:11:01 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 27/29] gnu: gtk+: Update package definition.
Date: Thu, 20 Aug 2020 17:10:48 +0200
Message-Id: <20200820151050.9529-27-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gtk+): Remove inheritance from gtk+-2.
[version]: Update to 3.24.20.
[source]<sha256>: Modify base32.
[arguments]<#:configure-flags>[--enable-cloudproviders]: New flag.
<#:phases>['pre-configure]: Remove phase.
['pre-check]: New phase.
['disable-failing-tests]: New phase.
[native-inputs]: Add docbook-xml, intltool, sassc and libxslt.
[inputs]: Add graphene, harfbuzz, iso-codes, libcloudproviders and papi.
[propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib,
libx11, libxcomposite, libxext, libxfixes and libxrender.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 218 ++++++++++++++++++++++++++-----------------
 1 file changed, 132 insertions(+), 86 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9b69f788bb..fcb0f8a2a7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -73,6 +73,7 @@
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages m4)
@@ -81,11 +82,14 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
+  #:use-module (gnu packages profiling)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages cups)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
@@ -833,92 +837,134 @@ application suites.")
     (license license:lgpl2.0+)))
 
 (define-public gtk+
-  (package (inherit gtk+-2)
-   (name "gtk+")
-   (version "3.24.20")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))
-            (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
-                                     "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
-   (propagated-inputs
-    `(("at-spi2-atk" ,at-spi2-atk)
-      ("atk" ,atk)
-      ("gdk-pixbuf" ,gdk-pixbuf+svg)
-      ("libepoxy" ,libepoxy)
-      ("libxcursor" ,libxcursor)
-      ("libxi" ,libxi)
-      ("libxinerama" ,libxinerama)
-      ("libxkbcommon" ,libxkbcommon)
-      ("libxdamage" ,libxdamage)
-      ("libxrandr" ,libxrandr)
-      ("mesa" ,mesa)
-      ("pango" ,pango)
-      ("wayland" ,wayland)
-      ("wayland-protocols" ,wayland-protocols)))
-   (inputs
-    `(("libxml2" ,libxml2)
-      ;; XXX: colord depends on mozjs (through polkit), which fails on
-      ;;      on non-intel systems now.
-      ;;("colord" ,colord)
-      ("cups" ,cups)                            ;for printing support
-      ;; XXX: rest depends on p11-kit, which fails on mips64el now.
-      ;;("rest" ,rest)
-      ("json-glib" ,json-glib)))
-   (native-inputs
-    `(("perl" ,perl)
-      ("glib" ,glib "bin")
-      ("gettext" ,gettext-minimal)
-      ("pkg-config" ,pkg-config)
-      ("gobject-introspection" ,gobject-introspection)
-      ("python-wrapper" ,python-wrapper)
-      ;; By using a special xorg-server for GTK+'s tests, we reduce the impact
-      ;; of updating xorg-server directly on the master branch.
-      ("xorg-server" ,xorg-server-for-tests)))
-   (arguments
-    `(#:disallowed-references (,xorg-server-for-tests)
-      ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
-      ;; to "doc".
-      #:configure-flags (list (string-append "--with-html-dir="
-                                             (assoc-ref %outputs "doc")
-                                             "/share/gtk-doc/html")
-                              ;; The header file <gdk/gdkwayland.h> is required
-                              ;; by gnome-control-center
-                              "--enable-wayland-backend"
-                              ;; This is necessary to build both backends.
-                              "--enable-x11-backend"
-                              ;; This enables the HTML5 websocket backend.
-                              "--enable-broadway-backend")
-      #:phases (modify-phases %standard-phases
-        (add-before 'configure 'pre-configure
-          (lambda _
-            ;; Disable most tests, failing in the chroot with the message:
-            ;; D-Bus library appears to be incorrectly set up; failed to read
-            ;; machine uuid: Failed to open "/etc/machine-id": No such file or
-            ;; directory.
-            ;; See the manual page for dbus-uuidgen to correct this issue.
-            (substitute* "testsuite/Makefile.in"
-              (("SUBDIRS = gdk gtk a11y css reftests")
-               "SUBDIRS = gdk"))
-            #t))
-        (add-after 'install 'move-desktop-files
-          ;; Move desktop files into 'bin' to avoid cycle references.
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (bin (assoc-ref outputs "bin")))
-              (mkdir-p (string-append bin "/share"))
-              (rename-file (string-append out "/share/applications")
-                           (string-append bin "/share/applications"))
-              #t))))))
-   (native-search-paths
-    (list (search-path-specification
-           (variable "GUIX_GTK3_PATH")
-           (files '("lib/gtk-3.0")))))))
+  (package
+    (name "gtk+")
+    (version "3.24.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))
+       (patches
+        (search-patches
+         "gtk3-respect-GUIX_GTK3_PATH.patch"
+         "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
+    (build-system gnu-build-system)
+    (outputs '("out" "bin" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--enable-x11-backend"
+        "--enable-broadway-backend"
+        "--enable-wayland-backend"
+        "--enable-cloudproviders"
+        (string-append "--with-html-dir=" (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a running X server.
+             (system "Xvfb :1 +extension GLX &")
+             (setenv "DISPLAY" ":1")
+             ;; Tests write to $HOME.
+             (setenv "HOME" (getcwd))
+             ;; Tests look for $XDG_RUNTIME_DIR.
+             (setenv "XDG_RUNTIME_DIR" (getcwd))
+             ;; For missing '/etc/machine-id'.
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             #t))
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "testsuite/gtk/Makefile.in"
+               (("builderparser cellarea check-icon-names check-cursor-names")
+                "builderparser cellarea check-cursor-names")
+               (("notify no-gtk-init object objects-finalize papersize rbtree")
+                "no-gtk-init papersize rbtree")
+               (("stylecontext templates textbuffer textiter treemodel treepath")
+                "stylecontext textbuffer textiter treemodel treepath"))
+             (substitute* "testsuite/a11y/Makefile.in"
+               (("accessibility-dump tree-performance text children derive")
+                "tree-performance text children derive"))
+             (substitute* "testsuite/reftests/Makefile.in"
+               (("TEST_PROGS = gtk-reftest")
+                "TEST_PROGS = "))
+             #t))
+         ;; Move desktop files into 'bin' to avoid cycle references.
+         (add-after 'install 'move-desktop-files
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (assoc-ref outputs "bin")))
+               (mkdir-p (string-append bin "/share"))
+               (rename-file
+                (string-append out "/share/applications")
+                (string-append bin "/share/applications"))
+               #t))))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("intltool" ,intltool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)
+       ("sassc" ,sassc)
+       ("xorg-server" ,xorg-server-for-tests)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("colord" ,colord)
+       ("cups" ,cups)
+       ("graphene" ,graphene)
+       ("harfbuzz" ,harfbuzz)
+       ("iso-codes" ,iso-codes)
+       ("json-glib" ,json-glib)
+       ("libcloudproviders" ,libcloudproviders)
+       ("libxml2" ,libxml2)
+       ("papi" ,papi)
+       ("rest" ,rest)))
+    (propagated-inputs
+     `(("atk" ,atk)
+       ("at-spi2-atk" ,at-spi2-atk)
+       ("cairo" ,cairo)
+       ("fribidi" ,fribidi)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
+       ("libepoxy" ,libepoxy)
+       ("libx11" ,libx11)
+       ("libxcomposite" ,libxcomposite)
+       ("libxcursor" ,libxcursor)
+       ("libxdamage" ,libxdamage)
+       ("libxext" ,libxext)
+       ("libxfixes" ,libxfixes)
+       ("libxi" ,libxi)
+       ("libxinerama" ,libxinerama)
+       ("libxkbcommon" ,libxkbcommon)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("mesa" ,mesa)
+       ("pango" ,pango)
+       ("wayland" ,wayland)
+       ("wayland-protocols" ,wayland-protocols)))
+    (native-search-paths
+     (list
+      (search-path-specification
+       (variable "GUIX_GTK3_PATH")
+       (files '("lib/gtk-3.0")))))
+    (search-paths native-search-paths)
+    (synopsis "Cross-platform toolkit for creating graphical user interfaces")
+    (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating
+graphical user interfaces.  Offering a complete set of widgets, GTK+ is
+suitable for projects ranging from small one-off tools to complete
+application suites.")
+    (home-page "https://www.gtk.org/")
+    (license license:lgpl2.0+)))
 
 ;;;
 ;;; Guile bindings.




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:33 2020
Received: from localhost ([127.0.0.1]:43510 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE0-0006A0-Rx
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42426)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDX-000658-GV
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 6EC563368321;
 Thu, 20 Aug 2020 17:11:02 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 29/29] gnu: gtk+: Add missing input.
Date: Thu, 20 Aug 2020 17:10:50 +0200
Message-Id: <20200820151050.9529-29-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/package/gtk.scm (gtk+) [native-inputs]: Add hicolor-icon-theme.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9326f3d4e3..d3602b5db5 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -909,6 +909,7 @@ application suites.")
        ("gettext" ,gettext-minimal)
        ("glib" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
        ("intltool" ,intltool)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:32 2020
Received: from localhost ([127.0.0.1]:43508 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE0-00069t-Ic
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42332)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDX-00063R-64
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 27D103368292;
 Thu, 20 Aug 2020 17:11:02 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 28/29] gnu: gtk+: Propagate libcloudproviders.
Date: Thu, 20 Aug 2020 17:10:49 +0200
Message-Id: <20200820151050.9529-28-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gtk+) [inputs]: Move libcloudproviders to ...
[propagated-inputs]: ... here.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fcb0f8a2a7..9326f3d4e3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -923,7 +923,6 @@ application suites.")
        ("harfbuzz" ,harfbuzz)
        ("iso-codes" ,iso-codes)
        ("json-glib" ,json-glib)
-       ("libcloudproviders" ,libcloudproviders)
        ("libxml2" ,libxml2)
        ("papi" ,papi)
        ("rest" ,rest)))
@@ -936,6 +935,7 @@ application suites.")
        ("freetype" ,freetype)
        ("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("glib" ,glib)
+       ("libcloudproviders" ,libcloudproviders)
        ("libepoxy" ,libepoxy)
        ("libx11" ,libx11)
        ("libxcomposite" ,libxcomposite)




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:32 2020
Received: from localhost ([127.0.0.1]:43506 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mE0-00069m-2v
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42348)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDS-00063Z-Ri
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id AB7F03368088;
 Thu, 20 Aug 2020 17:10:57 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package definition.
Date: Thu, 20 Aug 2020 17:10:33 +0200
Message-Id: <20200820151050.9529-12-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gdk-pixbuf): Update package definition.
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Djasper]: New flag.
<#:phases>['patch-docbook]: New phase.
['disable-failing-tests]: Remove phase.
[native-inputs]: Add docbook-xml, docbook-xsl, perl and libxslt.
[inputs]: Add jasper and libpng. Remove libx11.
[propagated-inputs]: Add libx11. Remove libpng.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Update to lgpl2.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 114 ++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c7bc9cf1a4..9af6e73e8a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -491,63 +491,65 @@ highlighting and other features typical of a source code editor.")
 
 (define-public gdk-pixbuf
   (package
-   (name "gdk-pixbuf")
-   (version "2.40.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))
-   (build-system meson-build-system)
-   (arguments
-    `(#:configure-flags '("-Dinstalled_tests=false")
-      #:phases
-      (modify-phases %standard-phases
-        (add-after
-         'unpack 'disable-failing-tests
-         (lambda _
-           (substitute* "tests/meson.build"
-             ;; XXX FIXME: This test fails on armhf machines with:
-             ;; SKIP Not enough memory to load bitmap image
-             ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2)
-             ((".*'cve-2015-4491'.*") "")
-             ;; XXX FIXME: This test fails with:
-             ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
-             ;; assertion failed (error == NULL): Data differ
-             ;; (gdk-pixbuf-error-quark, 0)
-             ((".*'pixbuf-jpeg'.*") ""))
-           #t))
-        ;; The slow tests take longer than the specified timeout.
-        ,@(if (any (cute string=? <> (%current-system))
-                   '("armhf-linux" "aarch64-linux"))
-            '((replace 'check
-              (lambda _
-                (invoke "meson" "test" "--timeout-multiplier" "5"))))
-            '()))))
-   (propagated-inputs
-    `(;; Required by gdk-pixbuf-2.0.pc
-      ("glib" ,glib)
-      ("libpng" ,libpng)
-      ;; Used for testing and required at runtime.
-      ("shared-mime-info" ,shared-mime-info)))
-   (inputs
-    `(("libjpeg" ,libjpeg-turbo)
-      ("libtiff" ,libtiff)
-      ("libx11"  ,libx11)))
-   (native-inputs
-     `(("pkg-config" ,pkg-config)
+    (name "gdk-pixbuf")
+    (version "2.40.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Djasper=true"
+        "-Dinstalled_tests=false")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs"
+               (substitute* "meson.build"
+                 (("http://docbook.sourceforge.net/release/xsl/current/")
+                  (string-append (assoc-ref inputs "docbook-xsl")
+                                 "/xml/xsl/docbook-xsl-1.79.1/")))
+               (substitute* '("gdk-pixbuf-csource.xml"
+                              "gdk-pixbuf-from-drawables.xml"
+                              "gdk-pixbuf-query-loaders.xml"
+                              "gdk-pixbuf-rendering.xml" "gdk-pixbuf.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("docbook-xsl" ,docbook-xsl)
        ("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-       ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
-   (synopsis "GNOME image loading and manipulation library")
-   (description
-    "GdkPixbuf is a library for image loading and manipulation developed
-in the GNOME project.")
-   (license license:lgpl2.0+)
-   (home-page "https://developer.gnome.org/gdk-pixbuf/")))
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("jasper" ,jasper)
+       ("libjpeg" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("libx11"  ,libx11)
+       ("shared-mime-info" ,shared-mime-info)))
+    (synopsis "Image loading library")
+    (description "GdkPixbuf is a library that loads image data in various
+formats and stores it as linear buffers in memory.  The buffers can then be
+scaled, composited, modified, saved, or rendered.")
+    (home-page "https://wiki.gnome.org/Projects/GdkPixbuf")
+    (license license:lgpl2.1+)))
 
 ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
 ;; on gdk-pixbuf, so this new varibale.  Also, librsvg adds 90MiB to the




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:32 2020
Received: from localhost ([127.0.0.1]:43504 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDz-00069e-GP
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42416)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDW-00064m-EK
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 4FD593368233;
 Thu, 20 Aug 2020 17:11:01 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 25/29] gnu: at-spi2-core: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:46 +0200
Message-Id: <20200820151050.9529-25-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (at-spi2-core): Update to 2.36.0.
[version]: Update to 2.36.0.
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#:phases>['patch-docbook-sgml]: New phase.
[native-inputs]: Add docbook-xml and python-wrapper.
[propagated-inputs]: Add libx11.
[home-page]: Modify.
[license]: Update to lgpl2.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 144 ++++++++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 65 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 7e32b7623b..5198754b2c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -594,72 +594,86 @@ scaled, composited, modified, saved, or rendered.")
 
 (define-public at-spi2-core
   (package
-   (name "at-spi2-core")
-   (version "2.34.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"))))
-   (build-system meson-build-system)
-   (outputs '("out" "doc"))
-   (arguments
-    '(#:configure-flags
-      (list "-Ddocs=true")
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'set-documentation-path
-          (lambda* (#:key outputs #:allow-other-keys)
-            ;; Ensure that the cross-references point to the "doc" output.
-            (substitute* "doc/libatspi/meson.build"
-              (("docpath =.*")
-               (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n")))
-            #t))
-        (add-before 'install 'prepare-doc-directory
-          (lambda* (#:key outputs #:allow-other-keys)
-            (mkdir-p (string-append (assoc-ref outputs "doc") "/share"))
-            #t))
-        (add-after 'install 'move-documentation
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (doc (assoc-ref outputs "doc")))
-              (copy-recursively
-               (string-append out "/share/gtk-doc")
-               (string-append doc "/share/gtk-doc"))
-              (delete-file-recursively
-               (string-append out "/share/gtk-doc")))
-            #t))
-        (add-after 'install 'check
-          (lambda _
-            (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
-            ;; Run test-suite under a dbus session.
-            (setenv "XDG_DATA_DIRS"     ; for finding org.xfce.Xfconf.service
-                    (string-append %output "/share"))
-            ;; Don't fail on missing  '/etc/machine-id'.
-            (setenv "DBUS_FATAL_WARNINGS" "0") ;
-            (invoke "dbus-launch" "ninja" "test")))
+    (name "at-spi2-core")
+    (version "2.36.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"))))
+    (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     '(#:glib-or-gtk? #t    ; To wrap binaries and/or compile schemas.
+       #:configure-flags
+       (list
+        "-Ddocs=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-documentation-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Ensure that the cross-references point to the "doc" output.
+             (substitute* "doc/libatspi/meson.build"
+               (("docpath =.*")
+                (string-append "docpath = '" (assoc-ref outputs "doc")
+                               "/share/gtk-doc/html'\n")))
+             #t))
+         (add-before 'install 'prepare-doc-directory
+           (lambda* (#:key outputs #:allow-other-keys)
+             (mkdir-p (string-append (assoc-ref outputs "doc")
+                                     "/share"))
+             #t))
+         (add-after 'unpack 'patch-docbook-sgml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+                                           "/xml/dtd/docbook")))
+               (substitute* "doc/libatspi/libatspi-docs.sgml"
+                 (("http://.*/docbookx\\.dtd")
+                  (string-append xmldoc "/docbookx.dtd")))
+               #t)))
+         (add-after 'install 'move-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (copy-recursively
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               (delete-file-recursively
+                (string-append out "/share/gtk-doc")))
+             #t))
+         (add-after 'install 'check
+           (lambda _
+             (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
+             ;; Run test-suite under a dbus session.
+             (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
+                     (string-append %output "/share"))
+             ;; Don't fail on missing  '/etc/machine-id'.
+             (setenv "DBUS_FATAL_WARNINGS" "0") ;
+             (invoke "dbus-launch" "ninja" "test")))
          (delete 'check))))
-   (propagated-inputs
-    ;; atspi-2.pc refers to all these.
-    `(("dbus" ,dbus)
-      ("glib" ,glib)
-      ("libxi" ,libxi)
-      ("libxtst" ,libxtst)))
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("gobject-introspection" ,gobject-introspection)
-      ("gtk-doc" ,gtk-doc)
-      ("glib" ,glib "bin")
-      ("pkg-config" ,pkg-config)))
-   (synopsis "Assistive Technology Service Provider Interface, core components")
-   (description
-    "The Assistive Technology Service Provider Interface, core components,
-is part of the GNOME accessibility project.")
-   (license license:lgpl2.0+)
-   (home-page "https://projects.gnome.org/accessibility/")))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("gettext" ,gettext-minimal)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
+    (propagated-inputs
+     `(("dbus" ,dbus)
+       ("glib" ,glib)
+       ("libx11" ,libx11)
+       ("libxi" ,libxi)
+       ("libxtst" ,libxtst)))
+    (synopsis "Assistive Technology Service Provider Interface, core components")
+    (description "The Assistive Technology Service Provider Interface,
+core components, is part of the GNOME accessibility project.")
+    (home-page "https://wiki.gnome.org/Accessibility/")
+    (license license:lgpl2.1+)))
 
 ;;; A minimal variant used to prevent a cycle with Inkscape.
 (define at-spi2-core-minimal




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:31 2020
Received: from localhost ([127.0.0.1]:43502 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDs-00069P-Ra
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:31 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42340)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDR-00063W-23
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 608693360398;
 Thu, 20 Aug 2020 17:10:56 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches
 back.
Date: Thu, 20 Aug 2020 17:10:28 +0200
Message-Id: <20200820151050.9529-7-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/glib.scm (gobject-introspection): Add patches back.
[source]<origin>[patches]: Add gobject-introspection-cc.patch,
gobject-introspection-girepository.patch and
gobject-introspection-absolute-shlib-path.patch.
* gnu/packages/patches/gobject-introspection-cc.patch: New file.
* gnu/packages/patches/gobject-introspection-girepository.patch: New file.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/local.mk                                  |   3 +
 gnu/packages/glib.scm                         |   7 +-
 ...ct-introspection-absolute-shlib-path.patch | 166 ++++++++++++++++++
 .../patches/gobject-introspection-cc.patch    |  14 ++
 .../gobject-introspection-girepository.patch  |  25 +++
 5 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
 create mode 100644 gnu/packages/patches/gobject-introspection-cc.patch
 create mode 100644 gnu/packages/patches/gobject-introspection-girepository.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 278879334c..ae708248e8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1065,6 +1065,9 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
   %D%/packages/patches/gnutls-cross.patch			\
+  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
+  %D%/packages/patches/gobject-introspection-cc.patch		\
+  %D%/packages/patches/gobject-introspection-girepository.patch	\
   %D%/packages/patches/go-skip-gc-test.patch			\
   %D%/packages/patches/gpm-glibc-2.26.patch			\
   %D%/packages/patches/gpsbabel-minizip.patch     		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1221612fbb..b5a37bb0cd 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -339,7 +339,12 @@ threads, dynamic loading, and an object system.")
                        name "/" (version-major+minor version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))))
+        (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))
+       (patches
+        (search-patches
+         "gobject-introspection-cc.patch"
+         "gobject-introspection-girepository.patch"
+         "gobject-introspection-absolute-shlib-path.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
new file mode 100644
index 0000000000..956fa617c3
--- /dev/null
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -0,0 +1,166 @@
+# Names of libraries included in typelib files are opened by dlopen.  Here we 
+# add the full path.
+#
+# This patch was provided by Luca Bruno <lucabru@HIDDEN>  for 
+# 'gobject-introspection' 1.40.0 in Nix.
+#
+# It has since been updated to work with newer versions of
+# gobject-introspection.
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
+     return group
+ 
+ 
++def _get_default_fallback_libpath():
++    # Newer multiple-output-optimized stdenv has an environment variable
++    # $outputLib which in turn specifies another variable which then is used as
++    # the destination for the library contents (${!outputLib}/lib).
++    store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
++    if store_path is None:
++        outputs = os.environ.get("outputs", "out").split()
++        if "lib" in outputs:
++            # For multiple output derivations let's try whether there is a $lib
++            # environment variable and use that as the base store path.
++            store_path = os.environ.get("lib")
++        elif "out" in outputs:
++            # Otherwise we have a single output derivation, so the libraries
++            # most certainly will end up in "$out/lib".
++            store_path = os.environ.get("out")
++
++    if store_path is not None:
++        # Even if we have a $lib as output, there still should be a $lib/lib
++        # directory.
++        return os.path.join(store_path, 'lib')
++    else:
++        # If we haven't found a possible scenario, let's return an empty string
++        # so that the shared library won't be prepended with a path.
++        #
++        # Note that this doesn't mean that all hope is lost, because after all
++        # we can still use --fallback-library-path to set one.
++        #
++        # Also, we're not returning None, because that would make it very
++        # difficult to disable adding fallback paths altogether using something
++        # like: --fallback-library-path=""
++        return ""
++
++
+ def _get_option_parser():
+     parser = optparse.OptionParser('%prog [options] sources',
+                                    version='%prog ' + giscanner.__version__)
+@@ -205,6 +238,10 @@ match the namespace prefix.""")
+     parser.add_option("", "--filelist",
+                       action="store", dest="filelist", default=[],
+                       help="file containing headers and sources to be scanned")
++    parser.add_option("", "--fallback-library-path",
++                      action="store", dest="fallback_libpath",
++                      default=_get_default_fallback_libpath(),
++                      help="Path to prepend to unknown shared libraries")
+ 
+     group = get_preprocessor_option_group(parser)
+     parser.add_option_group(group)
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
+     $""" % re.escape(library_name), re.VERBOSE)
+ 
+ 
++def _ldd_library_guix_pattern(library_name):
++    store_dir = re.escape(
++      os.environ.get("NIX_STORE", default="/gnu/store")
++    )
++    pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
++    return re.compile(pattern % (store_dir, re.escape(library_name)))
++
++
+ # This is a what we do for non-la files. We assume that we are on an
+ # ELF-like system where ldd exists and the soname extracted with ldd is
+ # a filename that can be opened with dlopen().
+@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
+             output = output.decode("utf-8", "replace")
+ 
+         shlibs = resolve_from_ldd_output(libraries, output)
+-        return list(map(sanitize_shlib_path, shlibs))
++        fallback_libpath = options.fallback_libpath or "";
++        return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
+ 
+ 
+ def sanitize_shlib_path(lib):
+@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
+     # In case we get relative paths on macOS (like @rpath) then we fall
+     # back to the basename as well:
+     # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
+-    if sys.platform == "darwin":
+-        if not os.path.isabs(lib):
+-            return os.path.basename(lib)
+-        return lib
+-    else:
++
++    # Always use absolute paths if available
++    if not os.path.isabs(lib):
+         return os.path.basename(lib)
++    return lib
+ 
+ 
+ def resolve_from_ldd_output(libraries, output):
+     patterns = {}
+     for library in libraries:
+         if not os.path.isfile(library):
+-            patterns[library] = _ldd_library_pattern(library)
++            patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
+     if len(patterns) == 0:
+         return []
+ 
+@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
+         if line.endswith(':'):
+             continue
+         for word in line.split():
+-            for library, pattern in patterns.items():
+-                m = pattern.match(word)
++            for library, (pattern, guix_pattern) in patterns.items():
++                store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
++                if line.find(store_dir) != -1:
++                    m = guix_pattern.match(word)
++                else:
++                    m = pattern.match(word)
+                 if m:
+                     del patterns[library]
+                     shlibs.append(m.group())
+
+--- a/giscanner/utils.py
++++ b/giscanner/utils.py
+@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
+     if dlname is None:
+         return None
+ 
+-    # Darwin uses absolute paths where possible; since the libtool files never
+-    # contain absolute paths, use the libdir field
+-    if platform.system() == 'Darwin':
+-        dlbasename = os.path.basename(dlname)
+-        libdir = _extract_libdir_field(la_file)
+-        if libdir is None:
+-            return dlbasename
+-        return libdir + '/' + dlbasename
+-    # From the comments in extract_libtool(), older libtools had
+-    # a path rather than the raw dlname
+-    return os.path.basename(dlname)
++    dlbasename = os.path.basename(dlname)
++    libdir = _extract_libdir_field(la_file)
++    if libdir is None:
++        return dlbasename
++    return libdir + '/' + dlbasename
+ 
+ 
+ def extract_libtool(la_file):
+--- a/tests/scanner/test_shlibs.py
++++ b/tests/scanner/test_shlibs.py
+@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
+ 
+         self.assertEqual(
+             sanitize_shlib_path('/foo/bar'),
+-            '/foo/bar' if sys.platform == 'darwin' else 'bar')
++            # Always use an absolute filename for Guix
++            '/foo/bar')
+ 
+     def test_unresolved_library(self):
+output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
new file mode 100644
index 0000000000..6a86b56b44
--- /dev/null
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -0,0 +1,14 @@
+Use gcc as the default C compiler if CC is not set.
+
+diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
+--- gobject-introspection-1.58.1.orig/giscanner/__init__.py	1970-01-01 01:00:00.000000000 +0100
++++ gobject-introspection-1.58.1/giscanner/__init__.py	2018-12-03 13:33:28.788971299 +0100
+@@ -22,6 +22,8 @@
+ builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
+ if builddir is not None:
+     __path__.append(os.path.join(builddir, 'giscanner'))
++if not 'CC' in os.environ:
++    os.environ['CC'] = 'gcc'
+ try:
+     from ._version import __version__
+ except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-girepository.patch b/gnu/packages/patches/gobject-introspection-girepository.patch
new file mode 100644
index 0000000000..380617f27f
--- /dev/null
+++ b/gnu/packages/patches/gobject-introspection-girepository.patch
@@ -0,0 +1,25 @@
+--- a/girepository/gitypelib.c.orig
++++ b/girepository/gitypelib.c
+@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib)
+         {
+           GModule *module;
+ 
++          /* 'gobject-introspection' doesn't store the path of shared
++             libraries into '.typelib' and '.gir' files.  Shared
++             libraries are searched for in the dynamic linker search
++             path.  In Guix we patch 'gobject-introspection' such that
++             it stores the absolute path of shared libraries in
++             '.typelib' and '.gir' files.  Here, in order to minimize
++             side effects, we make sure that if the library is not
++             found at the indicated path location, we try with just
++             the basename and the system dynamic library
++             infrastructure, as per default behaviour of the
++             library. */
+           module = load_one_shared_library (shlibs[i]);
++          if (module == NULL && g_path_is_absolute (shlibs[i]))
++            {
++              module = load_one_shared_library (g_basename(shlibs[i]));
++            }
+ 
+           if (module == NULL)
+             {




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:24 2020
Received: from localhost ([127.0.0.1]:43500 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDs-00069I-Bs
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42338)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDW-00063U-3p
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 10722336822D;
 Thu, 20 Aug 2020 17:11:01 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 24/29] gnu: json-glib: Update package definition.
Date: Thu, 20 Aug 2020 17:10:45 +0200
Message-Id: <20200820151050.9529-24-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (json-glib): Update package definition.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Ddocs]: New flag.
[-Dman]: New flag.
<#:phases>['patch-docbook]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt.
[synopsis]: Modify.
[description]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 71 +++++++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c5b67a808..d54e66adcd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3588,30 +3588,63 @@ configuration storage systems.")
   (package
     (name "json-glib")
     (version "1.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Ddocs=true"
+        "-Dman=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "json-glib-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/")))
+               (substitute* "meson.build"
+                 (("http://docbook.sourceforge.net/release/xsl/current/")
+                  (string-append (assoc-ref inputs "docbook-xsl")
+                                 "/xml/xsl/docbook-xsl-1.79.1/"))))
+             #t))
+         (add-after 'install 'move-docs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t))))))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")              ;for glib-mkenums and glib-genmarshal
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("docbook-xsl" ,docbook-xsl)
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
-       ("pkg-config" ,pkg-config)))
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
+       ("xsltproc" ,libxslt)))
     (propagated-inputs
-     `(("glib" ,glib)))                         ;according to json-glib-1.0.pc
-    (home-page "https://wiki.gnome.org/Projects/JsonGlib")
-    (synopsis "Compiler for the GObject type system")
-    (description
-     "JSON-GLib is a C library based on GLib providing serialization and
+     `(("glib" ,glib)))
+    (synopsis "Glib and GObject implementation of JSON")
+    (description "JSON-GLib is a library providing serialization and
 deserialization support for the JavaScript Object Notation (JSON) format
-described by RFC 4627.  It provides parser and generator GObject classes and
-various wrappers for the complex data types employed by JSON, such as arrays
-and objects.")
+described by RFC 4627.  It implements a full JSON parser and generator using
+GLib and GObject, and integrates JSON with GLib data types.")
+    (home-page "https://wiki.gnome.org/Projects/JsonGlib")
     (license license:lgpl2.1+)))
 
 (define-public libxklavier




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:24 2020
Received: from localhost ([127.0.0.1]:43498 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDs-00069A-1l
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42344)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDW-00063Y-72
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:03 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id A21653367F4A;
 Thu, 20 Aug 2020 17:10:56 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 08/29] gnu: pixman: Update package definition.
Date: Thu, 20 Aug 2020 17:10:29 +0200
Message-Id: <20200820151050.9529-8-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/xdisorg.scm (pixman) [version]: Update to 0.40.0.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:configure-flags>[--enable-timers]: New flag.
[--enable-gnuplot]: New flag.
[synopsis]: Modify.
[description]: Modify.
[license]: Change from X11 to expat.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 20702c3a4f..1765edafcd 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -469,30 +469,34 @@ following the mouse.")
 (define-public pixman
   (package
     (name "pixman")
-    (version "0.38.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.cairographics.org/releases/pixman-"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns"))
-              (patches (search-patches "pixman-CVE-2016-5296.patch"))))
+    (version "0.40.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://www.cairographics.org/releases/pixman-"
+         version ".tar.gz"))
+       (sha256
+        (base32 "1z13n96m7x91j25qq9wlkxsbq04wfwjhw66ir17frna06zn0s83d"))
+       (patches
+        (search-patches "pixman-CVE-2016-5296.patch"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")))
-    (inputs
-     `(("libpng" ,libpng)
-       ("zlib" ,zlib)))
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-timers"
+        "--enable-gnuplot")))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libpng" ,libpng)))
+    (synopsis "Image processing and manipulation library")
+    (description "Pixman is a library that provides low-level pixel manipulation
+features such as image compositing and trapezoid rasterization.")
     (home-page "http://www.pixman.org/")
-    (synopsis "Low-level pixel manipulation library")
-    (description "Pixman is a low-level software library for pixel
-manipulation, providing features such as image compositing and trapezoid
-rasterisation.")
-    (license license:x11)))
+    (license license:expat)))
 
 (define-public libdrm
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:24 2020
Received: from localhost ([127.0.0.1]:43496 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDr-000693-LF
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42392)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDV-00064B-Sv
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:03 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 8576433681D8;
 Thu, 20 Aug 2020 17:11:00 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Date: Thu, 20 Aug 2020 17:10:43 +0200
Message-Id: <20200820151050.9529-22-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (atkmm): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: Add new output "doc".
[arguments]<#:phases>['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and
libxslt.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add gpl2+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 60 +++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e8ba76694c..d595a8c7ec 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -75,6 +75,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
@@ -1224,24 +1225,49 @@ library.")
   (package
     (name "atkmm")
     (version "2.28.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnome/sources/" name "/"
-                                 (version-major+minor version)  "/"
-                                 name "-" version ".tar.xz"))
-             (sha256
-              (base32
-               "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/doc")
+                (string-append doc "/share/doc"))
+               #t))))))
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)
+       ("m4" ,m4)
+       ("mm-common" ,mm-common)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("xsltproc" ,libxslt)))
     (propagated-inputs
-     `(("glibmm" ,glibmm) ("atk" ,atk)))
-    (home-page "https://www.gtkmm.org")
-    (synopsis "C++ interface to the ATK accessibility library")
-    (description
-     "ATKmm provides a C++ programming interface to the ATK accessibility
-toolkit.")
-    (license license:lgpl2.1+)))
+     `(("atk" ,atk)
+       ("glibmm" ,glibmm-2.64)))
+    (synopsis "C++ bindings for ATK")
+    (description "ATKmm is the C++ binding for the ATK library.")
+    (home-page "https://wiki.gnome.org/Accessibility")
+    (license
+     (list
+      ;; Library
+      license:lgpl2.1+
+      ;; Tools
+      license:gpl2+))))
 
 (define-public gtkmm
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:23 2020
Received: from localhost ([127.0.0.1]:43494 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDr-00068w-5l
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:23 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42404)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDV-00064Q-KZ
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id B7C3633681CC;
 Thu, 20 Aug 2020 17:10:59 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 19/29] gnu: gtk+-2: Update package definition.
Date: Thu, 20 Aug 2020 17:10:40 +0200
Message-Id: <20200820151050.9529-19-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (gtk+-2): Update package definition.
[arguments]<#:phases>['disable-tests]: Remove phase.
['disable-failing-tests]: New phase.
['pre-check]: New phase.
[native-inputs]: Add intltool and xorg-server-for-tests.
[inputs]: Add libx11, libxext, libxkbcommon, libxrender and
libxshmfence.
[propagated-inputs]: Add cairo and glib.
[search-paths]: New field.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 155 +++++++++++++++++++++++++------------------
 1 file changed, 92 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bc450a33f6..e8ba76694c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -70,6 +70,7 @@
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
@@ -718,72 +719,100 @@ is part of the GNOME accessibility project.")
 
 (define-public gtk+-2
   (package
-   (name "gtk+")
-   (version "2.24.32")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))
-            (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
-                                     "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
-                                     "gtk2-theme-paths.patch"))))
-   (build-system gnu-build-system)
-   (outputs '("out" "bin" "doc"))
-   (propagated-inputs
-    `(("atk" ,atk)
-      ("gdk-pixbuf" ,gdk-pixbuf+svg)
-      ("pango" ,pango)))
-   (inputs
-    `(("cups" ,cups)
-      ("libxcomposite" ,libxcomposite)
-      ("libxcursor" ,libxcursor)
-      ("libxdamage" ,libxdamage)
-      ("libxi" ,libxi)
-      ("libxinerama" ,libxinerama)
-      ("libxrandr" ,libxrandr)))
-   (native-inputs
-    `(("perl" ,perl)
-      ("gettext" ,gettext-minimal)
-      ("glib" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("pkg-config" ,pkg-config)
-      ("python-wrapper" ,python-wrapper)))
-   (arguments
-    `(#:configure-flags
-      (list "--with-xinput=yes"
-            (string-append "--with-html-dir="
-                           (assoc-ref %outputs "doc")
-                           "/share/gtk-doc/html"))
-      #:phases
-      (modify-phases %standard-phases
-        (add-before 'configure 'disable-tests
-          (lambda _
-            ;; FIXME: re-enable tests requiring an X server
-            (substitute* "gtk/Makefile.in"
-              (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
-            #t))
-        (add-after 'install 'remove-cache
-          (lambda* (#:key outputs #:allow-other-keys)
-	    (for-each
-	      delete-file
-	      (find-files (assoc-ref outputs "out") "immodules.cache"))
-            #t)))))
-   (native-search-paths
-    (list (search-path-specification
-           (variable "GUIX_GTK2_PATH")
-           (files '("lib/gtk-2.0")))))
-   (synopsis "Cross-platform toolkit for creating graphical user interfaces")
-   (description
-    "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating
+    (name "gtk+")
+    (version "2.24.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))
+       (patches
+        (search-patches
+         "gtk2-respect-GUIX_GTK2_PATH.patch"
+         "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
+         "gtk2-theme-paths.patch"))))
+    (build-system gnu-build-system)
+    (outputs '("out" "bin" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--with-xinput=yes"
+        (string-append "--with-html-dir=" (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "gtk/tests/recentmanager.c"
+               (("g_test_add_func \\(\"/recent-manager/add-many\", recent_manager_add_many\\);")
+                ""))
+             (substitute* "gtk/tests/defaultvalue.c"
+               (("return g_test_run\\(\\);")
+                ""))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a running X server.
+             (system "Xvfb :1 +extension GLX &")
+             (setenv "DISPLAY" ":1")
+             ;; Tests write to $HOME.
+             (setenv "HOME" (getcwd))
+             ;; Tests look for $XDG_RUNTIME_DIR.
+             (setenv "XDG_RUNTIME_DIR" (getcwd))
+             ;; For missing '/etc/machine-id'.
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             #t))
+         (add-after 'install 'remove-cache
+           (lambda* (#:key outputs #:allow-other-keys)
+             (for-each
+              delete-file
+              (find-files (assoc-ref outputs "out") "immodules.cache"))
+             #t)))))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("intltool" ,intltool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)
+       ("xorg-server" ,xorg-server-for-tests)))
+    (inputs
+     `(("cups" ,cups)
+       ("libx11" ,libx11)
+       ("libxcomposite" ,libxcomposite)
+       ("libxcursor" ,libxcursor)
+       ("libxext" ,libxext)
+       ("libxdamage" ,libxdamage)
+       ("libxi" ,libxi)
+       ("libxinerama" ,libxinerama)
+       ("libxkbcommon" ,libxkbcommon)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxshmfence" ,libxshmfence)))
+    (propagated-inputs
+     `(("atk" ,atk)
+       ("cairo" ,cairo)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
+       ("pango" ,pango)))
+    (native-search-paths
+     (list
+      (search-path-specification
+       (variable "GUIX_GTK2_PATH")
+       (files '("lib/gtk-2.0")))))
+    (search-paths native-search-paths)
+    (synopsis "Cross-platform toolkit for creating graphical user interfaces")
+    (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating
 graphical user interfaces.  Offering a complete set of widgets, GTK+ is
 suitable for projects ranging from small one-off tools to complete
 application suites.")
-   (license license:lgpl2.0+)
-   (home-page "https://www.gtk.org/")))
+    (home-page "https://www.gtk.org/")
+    (license license:lgpl2.0+)))
 
 (define-public gtk+
   (package (inherit gtk+-2)




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:23 2020
Received: from localhost ([127.0.0.1]:43492 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDq-00068o-Ox
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:23 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42332)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDV-00063R-QJ
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 02E9F33681E5;
 Thu, 20 Aug 2020 17:10:59 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 20/29] gnu: wayland: Update package definition.
Date: Thu, 20 Aug 2020 17:10:41 +0200
Message-Id: <20200820151050.9529-20-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/freedesktop.scm (wayland) [version]: Update to 1.18.0.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to meson.
[outputs]: New output "doc".
[arguments]<#:parallel-tests?>: Remove argument.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Move here docbook-xml and docbook-xsl from ...
[inputs]: ... here. Move libffi to ...
[propagated-inputs]: ... here.
[synopsis]: Modify.
[description]: Modify.
[license]: Change from x11 to expat.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/freedesktop.scm | 87 +++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 23cd1aabf9..880c006e15 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -637,38 +637,75 @@ Python.")
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.17.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://wayland.freedesktop.org/releases/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"))))
-    (build-system gnu-build-system)
+    (version "1.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://wayland.freedesktop.org/releases/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"))))
+    (build-system meson-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     `(#:parallel-tests? #f))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* '("man/wl_display_connect.xml"
+                              "publican/sources/Architecture.xml"
+                              "publican/sources/Author_Group.xml"
+                              "publican/sources/Book_Info.xml"
+                              "publican/sources/Client.xml"
+                              "publican/sources/Compositors.xml"
+                              "publican/sources/Foreword.xml"
+                              "publican/sources/Introduction.xml"
+                              "publican/sources/Preface.xml"
+                              "publican/sources/Protocol.xml"
+                              "publican/sources/Server.xml"
+                              "publican/sources/Wayland.xml"
+                              "publican/sources/Xwayland.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.5/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))
+                 (("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")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/doc")
+                (string-append doc "/share/doc"))
+               #t))))))
     (native-inputs
-     `(("doxygen" ,doxygen)
-       ("graphviz" ,graphviz)
+     `(("docbook-xml-4.2" ,docbook-xml-4.2)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("dot" ,graphviz)
+       ("doxygen" ,doxygen)
        ("pkg-config" ,pkg-config)
        ("xmlto" ,xmlto)
        ("xsltproc" ,libxslt)))
     (inputs
-     `(("docbook-xml" ,docbook-xml)
-       ("docbook-xsl" ,docbook-xsl)
-       ("expat" ,expat)
-       ("libffi" ,libffi)
-       ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES
+     `(("expat" ,expat)
+       ("libxml2" ,libxml2)))
+    (propagated-inputs
+     `(("libffi" ,libffi)))
+    (synopsis "Core Wayland window system code and protocol")
+    (description "Wayland is a project to define a protocol for a compositor to
+talk to its clients as well as a library implementation of the protocol.  The
+compositor can be a standalone display server running on Linux kernel
+modesetting and evdev input devices, an X application, or a wayland client
+itself.  The clients can be traditional applications, X servers (rootless or
+fullscreen) or other display servers.")
     (home-page "https://wayland.freedesktop.org/")
-    (synopsis "Display server protocol")
-    (description
-     "Wayland is a protocol for a compositor to talk to its clients as well as
-a C library implementation of that protocol.  The compositor can be a standalone
-display server running on Linux kernel modesetting and evdev input devices, an X
-application, or a wayland client itself.  The clients can be traditional
-applications, X servers (rootless or fullscreen) or other display servers.")
-    (license license:x11)))
+    (license license:expat)))
 
 (define-public wayland-protocols
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:22 2020
Received: from localhost ([127.0.0.1]:43490 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDq-00068h-Dp
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:22 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42354)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDV-00063h-9t
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 7A5F933681D1;
 Thu, 20 Aug 2020 17:10:59 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0.
Date: Thu, 20 Aug 2020 17:10:39 +0200
Message-Id: <20200820151050.9529-18-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (atk): Update to 2.36.0.
[version]: Update to 2.36.0.
[arguments]<#:glib-or-gtk?>: New argument.
[home-page]: Modify.
[license]: Update to lgpl2.1+.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 51 +++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 113ee44ad1..bc450a33f6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -93,30 +93,33 @@
 
 (define-public atk
   (package
-   (name "atk")
-   (version "2.34.1")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version)  "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))
-   (build-system meson-build-system)
-   (propagated-inputs `(("glib" ,glib))) ; required by atk.pc
-   (native-inputs
-    `(("pkg-config" ,pkg-config)
-      ("gettext" ,gettext-minimal)
-      ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-      ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
-   (synopsis "GNOME accessibility toolkit")
-   (description
-    "ATK provides the set of accessibility interfaces that are implemented
-by other toolkits and applications.  Using the ATK interfaces, accessibility
-tools have full access to view and control running applications.")
-   (license license:lgpl2.0+)
-   (home-page "https://developer.gnome.org/atk/")))
+    (name "atk")
+    (version "2.36.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t))  ; To wrap binaries and/or compile schemas.
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("glib" ,glib)))
+    (synopsis "GNOME accessibility toolkit")
+    (description "ATK provides the set of accessibility interfaces that are
+implemented by other toolkits and applications.  Using the ATK interfaces,
+accessibility tools have full access to view and control running applications.")
+    (home-page "https://wiki.gnome.org/Accessibility")
+    (license license:lgpl2.1+)))
 
 (define-public cairo
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:22 2020
Received: from localhost ([127.0.0.1]:43488 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDq-00068a-0S
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:22 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42338)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDV-00063U-01
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id EBBFA3360623;
 Thu, 20 Aug 2020 17:10:58 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 16/29] gnu: libgsf: Update package definition.
Date: Thu, 20 Aug 2020 17:10:37 +0200
Message-Id: <20200820151050.9529-16-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (libgsf): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New outputs "bin" and "doc".
[arguments]<#:configure-flags>[--enable-introspection]: New flag.
[--with-gir-dir=]: New flag.
[--with-typelib-dir=]: New flag.
[--with-html-dir]: New flag.
[--with-zlib]: New flag.
[--with-bz2]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
[native-inputs]: Add docbook-xml, gobject-introspection and
python-wrapper.
[inputs]: Add gdk-pixbuf.
[propagated-inputs]: Remove gdk-pixbuf.
[synopsis]: Modify.
[home-page]: Modify.
[license]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 87 +++++++++++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7e3032022f..2bc70ec9c3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2247,39 +2247,74 @@ XML/CSS rendering engine.")
   (package
     (name "libgsf")
     (version "1.14.47")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version)  "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))))
-    (build-system gnu-build-system)
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "bin" "doc"))
     (arguments
-     '(#:configure-flags '("--disable-static")))
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-introspection"
+        (string-append "--with-gir-dir="
+                       (assoc-ref %outputs "out")
+                       "/share/gir-"
+                       ,(version-major
+                         (package-version gobject-introspection))
+                       ".0")
+        (string-append "--with-typelib-dir="
+                       (assoc-ref %outputs "out")
+                       "/lib/girepository-"
+                       ,(version-major
+                         (package-version gobject-introspection))
+                       ".0")
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html")
+        "--with-zlib"
+        "--with-bz2")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "gsf-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.5/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("docbook-xml" ,docbook-xml)
        ("gettext" ,gettext-minimal)
-
-       ;; For tests.
+       ("gobject-introspection" ,gobject-introspection)
        ("perl" ,perl)
-       ("perl-xml-parser" ,perl-xml-parser)))
+       ("perl-xml-parser" ,perl-xml-parser)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
     (inputs
-     `(("zlib" ,zlib)
-       ("bzip2" ,bzip2)))
+     `(("bzip2" ,bzip2)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("zlib" ,zlib)))
     (propagated-inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
+     `(("glib" ,glib)
        ("libxml2" ,libxml2)))
-    (home-page "https://www.gnome.org/projects/libgsf")
-    (synopsis "GNOME's Structured File Library")
-    (description
-     "Libgsf aims to provide an efficient extensible I/O abstraction for
-dealing with different structured file formats.")
-
-    ;; LGPLv2.1-only.
-    (license license:lgpl2.1)))
+    (synopsis "G Structured File Library")
+    (description "Libgsf aims to provide an efficient extensible I/O abstraction
+for dealing with different structured file formats.")
+    (home-page "https://gitlab.gnome.org/GNOME/libgsf")
+    (license
+     (list
+      ;; Library
+      license:lgpl2.1+
+      ;; Others
+      license:lgpl2.0+))))
 
 (define-public librsvg
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:22 2020
Received: from localhost ([127.0.0.1]:43486 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDm-00068P-GT
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:21 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42392)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDU-00064B-OU
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id ADE5B3368190;
 Thu, 20 Aug 2020 17:10:58 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 15/29] gnu: vala: Update package definition.
Date: Thu, 20 Aug 2020 17:10:36 +0200
Message-Id: <20200820151050.9529-15-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (vala) [version]: Update to 0.48.7.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to glib-or-gtk.
[arguments]<#:configure-flags>["--enable-coverage]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, help2man and perl.
[inputs]: Remove graphviz.
[propagated-inputs]: Add libgvc.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 84 +++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 881cfa493d..7e3032022f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -131,6 +131,7 @@
   #:use-module (gnu packages lirc)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mail)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages music)
@@ -3256,46 +3257,61 @@ passwords in the GNOME keyring.")
 (define-public vala
   (package
     (name "vala")
-    (version "0.46.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"))))
-    (build-system gnu-build-system)
+    (version "0.48.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8"))))
+    (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
+     `(#:configure-flags
+       (list
+        "--enable-coverage")
+       #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc/manual"
+               (substitute* '("manual.xml" "version.xml.in")
+                 (("http://www.oasis-open.org/docbook/xml/4.4/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
          (add-before 'check 'pre-check
-                     (lambda _
-                       (setenv "CC" "gcc")
-                       (substitute* "valadoc/tests/testrunner.sh"
-                         (("export PKG_CONFIG_PATH=" m)
-                          (string-append m "$PKG_CONFIG_PATH:")))
-                       ;; For missing '/etc/machine-id'.
-                       (setenv "DBUS_FATAL_WARNINGS" "0")
-                       #t)))))
+           (lambda _
+             (setenv "CC" "gcc")
+             (substitute* "valadoc/tests/testrunner.sh"
+               (("export PKG_CONFIG_PATH=" m)
+                (string-append m "$PKG_CONFIG_PATH:")))
+             ;; For missing '/etc/machine-id'.
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("bison" ,bison)
+       ("dbus" ,dbus)
+       ("docbook-xml" ,docbook-xml-4.4)
+       ("docbook-xsl" ,docbook-xsl)
        ("flex" ,flex)
-       ("bison" ,bison)
-       ("xsltproc" ,libxslt)
-       ("dbus" ,dbus)                                     ; for dbus tests
-       ("gobject-introspection" ,gobject-introspection))) ; for gir tests
-    (inputs
-     `(("graphviz" ,graphviz)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("help2man" ,help2man)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("xsltproc" ,libxslt)))
     (propagated-inputs
-     `(("glib" ,glib))) ; required by libvala-0.40.pc
-    (home-page "https://live.gnome.org/Vala/")
-    (synopsis "Compiler for the GObject type system")
-    (description
-     "Vala is a programming language that aims to bring modern programming
-language features to GNOME developers without imposing any additional runtime
-requirements and without using a different ABI compared to applications and
-libraries written in C.")
+     `(("glib" ,glib)
+       ("libgvc" ,graphviz)))
+    (synopsis "Compiler using the GObject type system")
+    (description "Vala is a programming language using modern high level
+abstractions without imposing additional runtime requirements and without using
+a different ABI compared to applications and libraries written in C.  Vala uses
+the GObject type system and has additional code generation routines that make
+targeting the GNOME stack simple.")
+    (home-page "https://wiki.gnome.org/Projects/Vala/")
     (license license:lgpl2.1+)))
 
 (define-public vala-0.48




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:18 2020
Received: from localhost ([127.0.0.1]:43484 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDk-00068B-BF
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:18 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42332)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDQ-00063R-It
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id C6F27336805A;
 Thu, 20 Aug 2020 17:10:55 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:26 +0200
Message-Id: <20200820151050.9529-5-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/glib.scm (gobject-introspection) [version]: Update
to 1.64.1.
[patches]: Remove all patches.
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>: Remove all phases.
[native-inputs]: Add bison and flex.
[inputs]: Remove bison, flex and zlib.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Delete file.
* gnu/packages/patches/gobject-introspection-cc.patch: Delete file.
* gnu/packages/patches/gobject-introspection-girepository.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove them.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/local.mk                                  |   3 -
 gnu/packages/glib.scm                         |  69 ++++----
 ...ct-introspection-absolute-shlib-path.patch | 166 ------------------
 .../patches/gobject-introspection-cc.patch    |  14 --
 .../gobject-introspection-girepository.patch  |  25 ---
 5 files changed, 30 insertions(+), 247 deletions(-)
 delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
 delete mode 100644 gnu/packages/patches/gobject-introspection-cc.patch
 delete mode 100644 gnu/packages/patches/gobject-introspection-girepository.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ae708248e8..278879334c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1065,9 +1065,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
   %D%/packages/patches/gnutls-cross.patch			\
-  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
-  %D%/packages/patches/gobject-introspection-cc.patch		\
-  %D%/packages/patches/gobject-introspection-girepository.patch	\
   %D%/packages/patches/go-skip-gc-test.patch			\
   %D%/packages/patches/gpm-glibc-2.26.patch			\
   %D%/packages/patches/gpsbabel-minizip.patch     		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 55ffdf724e..c4bf47512b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -330,56 +330,47 @@ threads, dynamic loading, and an object system.")
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.62.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnome/sources/"
-                   "gobject-introspection/" (version-major+minor version)
-                   "/gobject-introspection-" version ".tar.xz"))
-             (sha256
-              (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
-             (patches (search-patches
-                       "gobject-introspection-cc.patch"
-                       "gobject-introspection-girepository.patch"
-                       "gobject-introspection-absolute-shlib-path.patch"))))
+    (version "1.64.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       name "/" (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'do-not-use-/usr/bin/env
-           (lambda _
-             (substitute* "tools/g-ir-tool-template.in"
-               (("#!@PYTHON_CMD@")
-                (string-append "#!" (which "python3"))))
-             #t)))))
-    (inputs
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
+    (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-       ("glib" ,glib)
-       ("python" ,python-wrapper)
-       ("zlib" ,zlib)))
-    (native-inputs
-     `(("glib" ,glib "bin")
+       ("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("python" ,python-wrapper)))
     (propagated-inputs
-     `(;; In practice, GIR users will need libffi when using
-       ;; gobject-introspection.
-       ("libffi" ,libffi)))
+     `(("libffi" ,libffi)))
     (native-search-paths
      (list (search-path-specification
             (variable "GI_TYPELIB_PATH")
             (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
-    (home-page "https://wiki.gnome.org/GObjectIntrospection")
-    (synopsis "Generate interface introspection data for GObject libraries")
-    (description
-     "GObject introspection is a middleware layer between C libraries (using
-GObject) and language bindings.  The C library can be scanned at compile time
-and generate a metadata file, in addition to the actual native C library.  Then
-at runtime, language bindings can read this metadata and automatically provide
-bindings to call into the C library.")
-    ; Some bits are distributed under the LGPL2+, others under the GPL2+
-    (license license:gpl2+)))
+    (synopsis "GObject introspection tools and libraries")
+    (description "GObject introspection is a middleware layer between
+C libraries (using GObject) and language bindings.  The C library can be scanned
+at compile time and generate metadata files, in addition to the actual native
+C library.  Then language bindings can read this metadata and automatically
+provide bindings to call into the C library.")
+    (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection")
+    (license
+     (list
+      ;; For library.
+      license:lgpl2.0+
+      ;; For tools.
+      license:gpl2+))))
 
 (define intltool
   (package
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
deleted file mode 100644
index 956fa617c3..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-# Names of libraries included in typelib files are opened by dlopen.  Here we 
-# add the full path.
-#
-# This patch was provided by Luca Bruno <lucabru@HIDDEN>  for 
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
---- a/giscanner/scannermain.py
-+++ b/giscanner/scannermain.py
-@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
-     return group
- 
- 
-+def _get_default_fallback_libpath():
-+    # Newer multiple-output-optimized stdenv has an environment variable
-+    # $outputLib which in turn specifies another variable which then is used as
-+    # the destination for the library contents (${!outputLib}/lib).
-+    store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
-+    if store_path is None:
-+        outputs = os.environ.get("outputs", "out").split()
-+        if "lib" in outputs:
-+            # For multiple output derivations let's try whether there is a $lib
-+            # environment variable and use that as the base store path.
-+            store_path = os.environ.get("lib")
-+        elif "out" in outputs:
-+            # Otherwise we have a single output derivation, so the libraries
-+            # most certainly will end up in "$out/lib".
-+            store_path = os.environ.get("out")
-+
-+    if store_path is not None:
-+        # Even if we have a $lib as output, there still should be a $lib/lib
-+        # directory.
-+        return os.path.join(store_path, 'lib')
-+    else:
-+        # If we haven't found a possible scenario, let's return an empty string
-+        # so that the shared library won't be prepended with a path.
-+        #
-+        # Note that this doesn't mean that all hope is lost, because after all
-+        # we can still use --fallback-library-path to set one.
-+        #
-+        # Also, we're not returning None, because that would make it very
-+        # difficult to disable adding fallback paths altogether using something
-+        # like: --fallback-library-path=""
-+        return ""
-+
-+
- def _get_option_parser():
-     parser = optparse.OptionParser('%prog [options] sources',
-                                    version='%prog ' + giscanner.__version__)
-@@ -205,6 +238,10 @@ match the namespace prefix.""")
-     parser.add_option("", "--filelist",
-                       action="store", dest="filelist", default=[],
-                       help="file containing headers and sources to be scanned")
-+    parser.add_option("", "--fallback-library-path",
-+                      action="store", dest="fallback_libpath",
-+                      default=_get_default_fallback_libpath(),
-+                      help="Path to prepend to unknown shared libraries")
- 
-     group = get_preprocessor_option_group(parser)
-     parser.add_option_group(group)
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
-     $""" % re.escape(library_name), re.VERBOSE)
- 
- 
-+def _ldd_library_guix_pattern(library_name):
-+    store_dir = re.escape(
-+      os.environ.get("NIX_STORE", default="/gnu/store")
-+    )
-+    pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
-+    return re.compile(pattern % (store_dir, re.escape(library_name)))
-+
-+
- # This is a what we do for non-la files. We assume that we are on an
- # ELF-like system where ldd exists and the soname extracted with ldd is
- # a filename that can be opened with dlopen().
-@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
-             output = output.decode("utf-8", "replace")
- 
-         shlibs = resolve_from_ldd_output(libraries, output)
--        return list(map(sanitize_shlib_path, shlibs))
-+        fallback_libpath = options.fallback_libpath or "";
-+        return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
- 
- 
- def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
-     # In case we get relative paths on macOS (like @rpath) then we fall
-     # back to the basename as well:
-     # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
--    if sys.platform == "darwin":
--        if not os.path.isabs(lib):
--            return os.path.basename(lib)
--        return lib
--    else:
-+
-+    # Always use absolute paths if available
-+    if not os.path.isabs(lib):
-         return os.path.basename(lib)
-+    return lib
- 
- 
- def resolve_from_ldd_output(libraries, output):
-     patterns = {}
-     for library in libraries:
-         if not os.path.isfile(library):
--            patterns[library] = _ldd_library_pattern(library)
-+            patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
-     if len(patterns) == 0:
-         return []
- 
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
-         if line.endswith(':'):
-             continue
-         for word in line.split():
--            for library, pattern in patterns.items():
--                m = pattern.match(word)
-+            for library, (pattern, guix_pattern) in patterns.items():
-+                store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
-+                if line.find(store_dir) != -1:
-+                    m = guix_pattern.match(word)
-+                else:
-+                    m = pattern.match(word)
-                 if m:
-                     del patterns[library]
-                     shlibs.append(m.group())
-
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
-     if dlname is None:
-         return None
- 
--    # Darwin uses absolute paths where possible; since the libtool files never
--    # contain absolute paths, use the libdir field
--    if platform.system() == 'Darwin':
--        dlbasename = os.path.basename(dlname)
--        libdir = _extract_libdir_field(la_file)
--        if libdir is None:
--            return dlbasename
--        return libdir + '/' + dlbasename
--    # From the comments in extract_libtool(), older libtools had
--    # a path rather than the raw dlname
--    return os.path.basename(dlname)
-+    dlbasename = os.path.basename(dlname)
-+    libdir = _extract_libdir_field(la_file)
-+    if libdir is None:
-+        return dlbasename
-+    return libdir + '/' + dlbasename
- 
- 
- def extract_libtool(la_file):
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
- 
-         self.assertEqual(
-             sanitize_shlib_path('/foo/bar'),
--            '/foo/bar' if sys.platform == 'darwin' else 'bar')
-+            # Always use an absolute filename for Guix
-+            '/foo/bar')
- 
-     def test_unresolved_library(self):
-output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
deleted file mode 100644
index 6a86b56b44..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
---- gobject-introspection-1.58.1.orig/giscanner/__init__.py	1970-01-01 01:00:00.000000000 +0100
-+++ gobject-introspection-1.58.1/giscanner/__init__.py	2018-12-03 13:33:28.788971299 +0100
-@@ -22,6 +22,8 @@
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
-     __path__.append(os.path.join(builddir, 'giscanner'))
-+if not 'CC' in os.environ:
-+    os.environ['CC'] = 'gcc'
- try:
-     from ._version import __version__
- except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-girepository.patch b/gnu/packages/patches/gobject-introspection-girepository.patch
deleted file mode 100644
index 380617f27f..0000000000
--- a/gnu/packages/patches/gobject-introspection-girepository.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/girepository/gitypelib.c.orig
-+++ b/girepository/gitypelib.c
-@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib)
-         {
-           GModule *module;
- 
-+          /* 'gobject-introspection' doesn't store the path of shared
-+             libraries into '.typelib' and '.gir' files.  Shared
-+             libraries are searched for in the dynamic linker search
-+             path.  In Guix we patch 'gobject-introspection' such that
-+             it stores the absolute path of shared libraries in
-+             '.typelib' and '.gir' files.  Here, in order to minimize
-+             side effects, we make sure that if the library is not
-+             found at the indicated path location, we try with just
-+             the basename and the system dynamic library
-+             infrastructure, as per default behaviour of the
-+             library. */
-           module = load_one_shared_library (shlibs[i]);
-+          if (module == NULL && g_path_is_absolute (shlibs[i]))
-+            {
-+              module = load_one_shared_library (g_basename(shlibs[i]));
-+            }
- 
-           if (module == NULL)
-             {




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:16 2020
Received: from localhost ([127.0.0.1]:43482 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDj-000684-TZ
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:16 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42354)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDS-00063h-Sa
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 2C70F336807D;
 Thu, 20 Aug 2020 17:10:57 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 10/29] gnu: cairo: Update package definition.
Date: Thu, 20 Aug 2020 17:10:31 +0200
Message-Id: <20200820151050.9529-10-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gtk.scm (cairo): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
[native-inputs]: Add gobject-introspection.
[inputs]: Add libdrm. Remove xorgproto and zlib.
[propagated-inputs]: Add libxcb.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gtk.scm | 114 ++++++++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e3c097943f..2f939ff0bd 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -119,57 +119,71 @@ tools have full access to view and control running applications.")
 
 (define-public cairo
   (package
-   (name "cairo")
-   (version "1.16.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://cairographics.org/releases/cairo-"
-                                version ".tar.xz"))
-            (sha256
-             (base32
-              "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
-   (build-system gnu-build-system)
-   (propagated-inputs
-    `(("fontconfig" ,fontconfig)
-      ("freetype" ,freetype)
-      ("glib" ,glib)
-      ("libpng" ,libpng)
-      ("libx11" ,libx11)
-      ("libxext" ,libxext)
-      ("libxrender" ,libxrender)
-      ("pixman" ,pixman)))
-   (inputs
-    `(("ghostscript" ,ghostscript)
-      ("libspectre" ,libspectre)
-      ("poppler" ,poppler)
-      ("xorgproto" ,xorgproto)
-      ("zlib" ,zlib)))
-   (native-inputs
-     `(("pkg-config" ,pkg-config)
-      ("python" ,python-wrapper)))
+    (name "cairo")
+    (version "1.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://cairographics.org/releases/cairo-"
+                       version ".tar.xz"))
+       (sha256
+        (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     `(#:tests? #f  ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
-       #:configure-flags '("--enable-tee"      ;needed for GNU Icecat
-                           "--enable-xml"      ;for cairo-xml support
-                           "--disable-static")))
-   (synopsis "2D graphics library")
-   (description
-    "Cairo is a 2D graphics library with support for multiple output devices.
-Currently supported output targets include the X Window System (via both
-Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
-output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
-
-Cairo is designed to produce consistent output on all output media while
-taking advantage of display hardware acceleration when available
-eg. through the X Render Extension).
-
-The cairo API provides operations similar to the drawing operators of
-PostScript and PDF.  Operations in cairo including stroking and filling cubic
-Bézier splines, transforming and compositing translucent images, and
-antialiased text rendering.  All drawing operations can be transformed by any
-affine transformation (scale, rotation, shear, etc.).")
-   (license license:lgpl2.1) ; or Mozilla Public License 1.1
-   (home-page "https://cairographics.org/")))
+     `(#:tests? #f ; See http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+       #:configure-flags
+       (list
+        "--disable-static"
+        ;; XXX: To be enabled.
+        ;; "--enable-gallium=yes"
+        ;; "--enable-gl=yes"
+        ;; " --enable-glesv2=yes"
+        ;; "--enable-glesv3=yes"
+        ;; "--enable-cogl=yes"
+        ;; "--enable-directfb=yes"
+        ;; "--enable-vg=yes"
+        "--enable-tee=yes"
+        "--enable-xml=yes"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))))
+    (native-inputs
+     `(("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("drm" ,libdrm)
+       ("ghostscript" ,ghostscript)
+       ("libspectre" ,libspectre)
+       ("poppler" ,poppler)))
+    (propagated-inputs
+     `(;; ("cogl" ,cogl)
+       ;; ("directfb" ,directfb)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("glib" ,glib)
+       ;; ("gtk+" ,gtk+)
+       ("libpng" ,libpng)
+       ;; ("librsvg" ,librsvg)
+       ;; ("opengl" ,mesa)
+       ("pixman" ,pixman)
+       ("x11" ,libx11)
+       ("xcb" ,libxcb)
+       ("xext" ,libxext)
+       ("xrender" ,libxrender)))
+    (synopsis "Multi-platform 2D graphics library")
+    (description "Cairo is a 2D graphics library with support for multiple output
+devices.  Currently supported output targets include the X Window System (via
+both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
+output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
+    (home-page "https://cairographics.org/")
+    (license
+     ;; This project is dual-licensed.
+     (list
+      license:lgpl2.1+
+      license:mpl1.1))))
 
 (define-public cairo-xcb
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:15 2020
Received: from localhost ([127.0.0.1]:43480 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDj-00067x-KX
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:15 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42338)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDT-00063U-Pb
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:00 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 254EE3365588;
 Thu, 20 Aug 2020 17:10:56 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib.
Date: Thu, 20 Aug 2020 17:10:27 +0200
Message-Id: <20200820151050.9529-6-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/glib.scm (gobject-introspection) [inputs]: Move glib
to ...
[propagated-inputs]: ... here.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/glib.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index c4bf47512b..1221612fbb 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -349,10 +349,10 @@ threads, dynamic loading, and an object system.")
        ("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("glib" ,glib)
-       ("python" ,python-wrapper)))
+     `(("python" ,python-wrapper)))
     (propagated-inputs
-     `(("libffi" ,libffi)))
+     `(("glib" ,glib)
+       ("libffi" ,libffi)))
     (native-search-paths
      (list (search-path-specification
             (variable "GI_TYPELIB_PATH")




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:15 2020
Received: from localhost ([127.0.0.1]:43473 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDb-00066j-MZ
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:15 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42316)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDP-00063F-Tq
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:00 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 383853360C6A;
 Thu, 20 Aug 2020 17:10:55 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 03/29] gnu: glib: Update package definition.
Date: Thu, 20 Aug 2020 17:10:24 +0200
Message-Id: <20200820151050.9529-3-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/glib.scm (glib) [version]: Update to 2.64.3.
[source]<origin>[sha256]: Modify base32.
[patches]: Add glib-disable-failing-tests.patch.
Remove glib-tests-timer.patch.
[arguments]<#:disallowed-references>: Remove argument.
<#:phases>['patch-python-references]: New phase.
['pre-check]: New phase.
['move-bin]: New phase.
['patch-dbus-launch-path]: Remove phase.
['patch-gio-launch-desktop]: Remove phase.
['pre-build]: Remove phase.
['disable-failing-tests]: Remove phase.
['check]: Remove phase.
['move-executables]: Remove phase.
[native-inputs]: Add intltool, python, libxml2 and libxslt.
Remove dbus.
[inputs]: Add dbus and libelf.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Update to lgpl2.1+.
* gnu/packages/patches/glib-disable-failing-tests.patch: New file.
* gnu/packages/patches/glib-tests-timer.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/local.mk                                  |   2 +-
 gnu/packages/glib.scm                         | 316 ++++++------------
 .../patches/glib-disable-failing-tests.patch  |  84 +++++
 gnu/packages/patches/glib-tests-timer.patch   |  15 -
 4 files changed, 194 insertions(+), 223 deletions(-)
 create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch
 delete mode 100644 gnu/packages/patches/glib-tests-timer.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index edb4e69895..ae708248e8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1015,7 +1015,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
-  %D%/packages/patches/glib-tests-timer.patch			\
+  %D%/packages/patches/glib-disable-failing-tests.patch		\
   %D%/packages/patches/glibc-CVE-2015-5180.patch		\
   %D%/packages/patches/glibc-CVE-2015-7547.patch		\
   %D%/packages/patches/glibc-CVE-2016-3075.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 9f0721b8c2..057b90eaa1 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages elf)
   #:use-module (gnu packages enlightenment)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
@@ -176,213 +177,114 @@ shared NFS home directories.")
 
 (define glib
   (package
-   (name "glib")
-   (version "2.62.6")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/"
-                                name "/" (string-take version 4) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
-            (patches (search-patches "glib-tests-timer.patch"))
-            (modules '((guix build utils)))
-            (snippet
-             '(begin
-                (substitute* "tests/spawn-test.c"
-                  (("/bin/sh") "sh"))
-                #t))))
-   (build-system meson-build-system)
-   (outputs '("out"           ; everything
-              "bin"))         ; glib-mkenums, gtester, etc.; depends on Python
-   (propagated-inputs
-    `(("pcre" ,pcre)  ; in the Requires.private field of glib-2.0.pc
-      ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc
-      ;; These are in the Requires.private field of gio-2.0.pc
-      ("util-linux" ,util-linux "lib")  ;for libmount
-      ("libselinux" ,libselinux)
-      ("zlib" ,zlib)))
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("m4" ,m4) ; for installing m4 macros
-      ("dbus" ,dbus)                              ; for GDBus tests
-      ("pkg-config" ,pkg-config)
-      ("python" ,python-wrapper)
-      ("perl" ,perl)                              ; needed by GIO tests
-      ("tzdata" ,tzdata-for-tests)))                  ; for tests/gdatetime.c
-   (arguments
-    `(#:disallowed-references (,tzdata-for-tests)
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'patch-dbus-launch-path
-          (lambda* (#:key inputs #:allow-other-keys)
-            (let ((dbus (assoc-ref inputs "dbus")))
-              (substitute* "gio/gdbusaddress.c"
-                (("command_line = g_strdup_printf \\(\"dbus-launch")
-                 (string-append "command_line = g_strdup_printf (\""
-                                dbus "/bin/dbus-launch")))
-              #t)))
-        (add-after 'unpack 'patch-gio-launch-desktop
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
-              ;; for another future fix.
-              (substitute* "gio/gdesktopappinfo.c"
-               (("gio-launch-desktop")
-                (string-append out "/libexec/gio-launch-desktop")))
-              #t)))
-        (add-before 'build 'pre-build
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            ;; For tests/gdatetime.c.
-            (setenv "TZDIR"
-                    (string-append (assoc-ref inputs "tzdata")
-                                   "/share/zoneinfo"))
-
-            ;; Some tests want write access there.
-            (setenv "HOME" (getcwd))
-            (setenv "XDG_CACHE_HOME" (getcwd))
-            #t))
-        (add-after 'unpack 'disable-failing-tests
-          (lambda _
-            (let ((disable
-                   (lambda (test-file test-paths)
-                     (define pattern+procs
-                       (map (lambda (test-path)
-                              (cons
-                               ;; XXX: only works for single line statements.
-                               (format #f "g_test_add_func.*\"~a\".*" test-path)
-                               (const "")))
-                            test-paths))
-                     (substitute test-file pattern+procs)))
-                  (failing-tests
-                   '(("glib/tests/thread.c"
-                      (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64
-                       ;; as found on hydra.gnu.org, and strace(1) doesn't
-                       ;; recognize it.
-                       "/thread/thread4"))
-
-                     ;; This tries to find programs in FHS directories.
-                     ("glib/tests/utils.c"
-                      ("/utils/find-program"))
-
-                     ;; This fails because "glib/tests/echo-script" cannot be
-                     ;; found.
-                     ("glib/tests/spawn-singlethread.c"
-                      ("/gthread/spawn-script"))
-
-                     ("glib/tests/timer.c"
-                      (;; fails if compiler optimizations are enabled, which they
-                       ;; are by default.
-                       "/timer/stop"))
-
-                     ("gio/tests/gapplication.c"
-                      (;; XXX: proven to be unreliable.  See:
-                       ;;  <https://bugs.debian.org/756273>
-                       ;;  <http://bugs.gnu.org/18445>
-                       "/gapplication/quit"
-
-                       ;; XXX: fails randomly for unknown reason. See:
-                       ;;  <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00215.html>
-                       "/gapplication/local-actions"))
-
-                     ("gio/tests/contenttype.c"
-                      (;; XXX: requires shared-mime-info.
-                       "/contenttype/guess"
-                       "/contenttype/guess_svg_from_data"
-                       "/contenttype/subtype"
-                       "/contenttype/list"
-                       "/contenttype/icon"
-                       "/contenttype/symbolic-icon"
-                       "/contenttype/tree"))
-
-                     ("gio/tests/appinfo.c"
-                      (;; XXX: requires update-desktop-database.
-                       "/appinfo/associations"))
-
-                     ("gio/tests/desktop-app-info.c"
-                      (;; XXX: requires update-desktop-database.
-                       "/desktop-app-info/delete"
-                       "/desktop-app-info/default"
-                       "/desktop-app-info/fallback"
-                       "/desktop-app-info/lastused"
-                       "/desktop-app-info/search"))
-
-                     ("gio/tests/gdbus-peer.c"
-                      (;; Requires /etc/machine-id.
-                       "/gdbus/codegen-peer-to-peer"))
-
-                     ("gio/tests/gdbus-address-get-session.c"
-                      (;; Requires /etc/machine-id.
-                       "/gdbus/x11-autolaunch"))
-
-                     ("gio/tests/gsocketclient-slow.c"
-                      (;; These tests tries to resolve "localhost", and fails.
-                       "/socket-client/happy-eyeballs/slow"
-                       "/socket-client/happy-eyeballs/cancellation/delayed"))
-
-                     )))
-              (for-each (lambda (x) (apply disable x)) failing-tests)
-              #t)))
-        (replace 'check
-          (lambda _
-            (setenv "MESON_TESTTHREADS"
-                    (number->string (parallel-job-count)))
-            ;; Do not run tests marked as "flaky".
-            (invoke "meson" "test" "--no-suite" "flaky")))
-        ;; TODO: meson does not permit the bindir to be outside of prefix.
-        ;; See https://github.com/mesonbuild/meson/issues/2561
-        ;; We can remove this once meson is patched.
-        (add-after 'install 'move-executables
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (bin (assoc-ref outputs "bin")))
-              (mkdir-p bin)
-              (rename-file (string-append out "/bin")
-                           (string-append bin "/bin"))
-              ;; This one is an implementation detail of glib.
-              ;; It is wrong that that's in "/bin" in the first place,
-              ;; but that's what upstream is doing right now.
-              ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
-              (mkdir (string-append out "/libexec"))
-              (rename-file (string-append bin "/bin/gio-launch-desktop")
-                           (string-append out "/libexec/gio-launch-desktop"))
-              ;; Do not refer to "bindir", which points to "${prefix}/bin".
-              ;; We don't patch "bindir" to point to "$bin/bin", because that
-              ;; would create a reference cycle between the "out" and "bin"
-              ;; outputs.
-              (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc")
-                                 (string-append out "/lib/pkgconfig/glib-2.0.pc"))
-                (("bindir=\\$\\{prefix\\}/bin") "")
-                (("=\\$\\{bindir\\}/") "="))
-              #t))))))
-      ;; TODO: see above for explanation.
-      ;; #:configure-flags (list (string-append "--bindir="
-      ;;                                        (assoc-ref %outputs "bin")
-      ;;                                        "/bin"))
-
-   (native-search-paths
-    ;; This variable is not really "owned" by GLib, but several related
-    ;; packages refer to it: gobject-introspection's tools use it as a search
-    ;; path for .gir files, and it's also a search path for schemas produced
-    ;; by 'glib-compile-schemas'.
-    (list (search-path-specification
-           (variable "XDG_DATA_DIRS")
-           (files '("share")))
-          ;; To load extra gio modules from glib-networking, etc.
-          (search-path-specification
-           (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
-    "GLib provides data structure handling for C, portability wrappers,
-and interfaces for such runtime functionality as an event loop, threads,
-dynamic loading, and an object system.")
-   (home-page "https://developer.gnome.org/glib/")
-   (license license:lgpl2.1+)))
+    (name "glib")
+    (version "2.64.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       name "/" (string-take version 4) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"))
+       (patches
+        (search-patches "glib-disable-failing-tests.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "tests/spawn-test.c"
+             (("/bin/sh") "sh"))
+           #t))))
+    (build-system meson-build-system)
+    (outputs '("out" "bin"))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Python references are not being patched in patch-phase of build,
+         ;; despite using python-wrapper as input. So we patch them manually.
+         (add-after 'unpack 'patch-python-references
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in"
+                            "glib/gtester-report.in"
+                            "gobject/glib-genmarshal.in"
+                            "gobject/glib-mkenums.in")
+               (("@PYTHON@")
+                (string-append (assoc-ref inputs "python")
+                               "/bin/python"
+                               ,(version-major+minor
+                                 (package-version python)))))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; For tests/gdatetime.c.
+             (setenv "TZDIR"
+                     (string-append (assoc-ref inputs "tzdata")
+                                    "/share/zoneinfo"))
+             ;; Some tests want write access there.
+             (setenv "HOME" (getcwd))
+             (setenv "XDG_CACHE_HOME" (getcwd))
+             #t))
+         ;; Meson does not permit the bindir to be outside of prefix.
+         (add-after 'install 'move-bin
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (assoc-ref outputs "bin")))
+               (mkdir-p bin)
+               (rename-file
+                (string-append out "/bin")
+                (string-append bin "/bin"))
+               ;; Do not refer to "bindir", which points to "${prefix}/bin".
+               ;; We don't patch "bindir" to point to "$bin/bin", because that
+               ;; would create a reference cycle between the "out" and "bin"
+               ;; outputs.
+               (substitute*
+                   (list
+                    (string-append out "/lib/pkgconfig/gio-2.0.pc")
+                    (string-append out "/lib/pkgconfig/glib-2.0.pc"))
+                 (("bindir=\\$\\{prefix\\}/bin") "")
+                 (("=\\$\\{bindir\\}/") "="))
+               #t))))))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("libintl" ,intltool)
+       ("m4" ,m4)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)
+       ("python" ,python)               ; For 'patch-python-references
+       ("tzdata" ,tzdata-for-tests)
+       ("xmllint" ,libxml2)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("libelf" ,libelf)))
+    (propagated-inputs
+     `(("libffi" ,libffi)
+       ("libselinux" ,libselinux)
+       ("pcre" ,pcre)
+       ("util-linux" ,util-linux "lib")
+       ("zlib" ,zlib)))
+    (native-search-paths
+     ;; This variable is not really "owned" by GLib, but several related
+     ;; packages refer to it: gobject-introspection's tools use it as a search
+     ;; path for .gir files, and it's also a search path for schemas produced
+     ;; by 'glib-compile-schemas'.
+     (list
+      (search-path-specification
+       (variable "XDG_DATA_DIRS")
+       (files '("share")))
+      ;; To load extra gio modules from glib-networking, etc.
+      (search-path-specification
+       (variable "GIO_EXTRA_MODULES")
+       (files '("lib/gio/modules")))))
+    (search-paths native-search-paths)
+    (synopsis "Low-level core library for GNOME projects")
+    (description "GLib provides data structure handling for C, portability
+wrappers, and interfaces for such runtime functionality as an event loop,
+threads, dynamic loading, and an object system.")
+    (home-page "https://wiki.gnome.org/Projects/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,
diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/packages/patches/glib-disable-failing-tests.patch
new file mode 100644
index 0000000000..3601c42030
--- /dev/null
+++ b/gnu/packages/patches/glib-disable-failing-tests.patch
@@ -0,0 +1,84 @@
+From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@HIDDEN>
+Date: Tue, 9 Jun 2020 05:17:53 -0400
+Subject: [PATCH] PATCH: Disable failing tests.
+
+---
+ gio/tests/meson.build  | 19 -------------------
+ glib/tests/meson.build |  2 --
+ 2 files changed, 21 deletions(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index c7c3e3035..6e38eb39e 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -34,7 +34,6 @@ gio_tests = {
+   'buffered-output-stream' : {},
+   'cancellable' : {},
+   'contexts' : {},
+-  'contenttype' : {},
+   'converter-stream' : {},
+   'credentials' : {},
+   'data-input-stream' : {},
+@@ -78,7 +77,6 @@ gio_tests = {
+   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
+-  'gdbus-address-get-session' : {},
+   'win32-appinfo' : {},
+ }
+ 
+@@ -135,10 +133,6 @@ endif
+ if host_machine.system() != 'windows'
+   gio_tests += {
+     'file' : {},
+-    'gdbus-peer' : {
+-      'dependencies' : [libgdbus_example_objectmanager_dep],
+-      'install_rpath' : installed_tests_execdir
+-    },
+     'gdbus-peer-object-manager' : {},
+     'live-g-file' : {},
+     'socket-address' : {},
+@@ -173,19 +167,6 @@ if host_machine.system() != 'windows'
+     }
+   endif
+ 
+-  # Uninstalled because of the check-for-executable logic in DesktopAppInfo
+-  # unable to find the installed executable
+-  if not glib_have_cocoa
+-    gio_tests += {
+-      'appinfo' : {
+-        'install' : false,
+-      },
+-      'desktop-app-info' : {
+-        'install' : false,
+-      },
+-    }
+-  endif
+-
+   test_extra_programs += {
+     'basic-application' : {},
+     'dbus-launch' : {},
+diff --git a/glib/tests/meson.build b/glib/tests/meson.build
+index 8da477d19..9fa24dd49 100644
+--- a/glib/tests/meson.build
++++ b/glib/tests/meson.build
+@@ -103,7 +103,6 @@ glib_tests = {
+   'utf8-pointer' : {},
+   'utf8-validate' : {},
+   'utf8-misc' : {},
+-  'utils' : {},
+   'unicode' : {},
+   'uri' : {},
+   '1bit-mutex' : {},
+@@ -151,7 +150,6 @@ if host_machine.system() == 'windows'
+ else
+   glib_tests += {
+     'include' : {},
+-    'unix' : {},
+   }
+   if have_rtld_next
+     glib_tests += {
+-- 
+2.26.2
+
diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch
deleted file mode 100644
index e37425c0c8..0000000000
--- a/gnu/packages/patches/glib-tests-timer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* On i686 floating-point roundoff errors could sometimes cause this check to
-  fail depending on the elapsed microseconds.  Improve rounding by adding a
-  fractional bit.
-
---- glib-2.40.0/glib/tests/timer.c	2014-03-05 08:05:42.000000000 -0600
-+++ glib-2.40.0/glib/tests/timer.c	2014-07-10 16:33:12.746862822 -0500
-@@ -35,7 +35,7 @@
-   elapsed = g_timer_elapsed (timer, &micros);
- 
-   g_assert_cmpfloat (elapsed, <, 1.0);
--  g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000);
-+  g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000);
- 
-   g_timer_destroy (timer);
- }




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:07 2020
Received: from localhost ([127.0.0.1]:43470 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDa-00066M-KC
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:07 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42348)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDR-00063Z-Ij
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:58 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id E30483368069;
 Thu, 20 Aug 2020 17:10:56 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 09/29] gnu: openjpeg: Update package definition.
Date: Thu, 20 Aug 2020 17:10:30 +0200
Message-Id: <20200820151050.9529-9-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/image.scm (openjpeg): Update package definition.
[outputs]: New output "doc".
[arguments]<#:tests?>: Remove argument.
<#:configure-flags>[-DBUILD_DOC]: New flag.
[-DBUILD_LUTS_GENERATOR]: New flag.
[-DBUILD_UNIT_TESTS]: New flag.
[-DBUILD_MJ2]: New flag.
[-DBUILD_JPWL]: New flag.
[-DBUILD_JP3D]: New flag.
[-DBUILD_TESTING]: New flag.
[-DOPJ_DATA_ROOT]: New flag.
<#:phases>['disable-failing-tests]: New phase.
['move-docs]: New phase.
[native-inputs]: Add doxygen, openjpeg-data and python-wrapper.
[inputs]: Add curl and fcgi.
[synopsis]: Modify.
[description]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/image.scm | 88 +++++++++++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3fdc6db8a1..5a4425e993 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -763,35 +763,71 @@ images of initially unknown height.")
   (package
     (name "openjpeg")
     (version "2.3.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/uclouvain/openjpeg")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name "openjpeg" version))
-              (sha256
-               (base32
-                "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/uclouvain/openjpeg.git")
+         (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
     (build-system cmake-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     '(#:tests? #f                   ;TODO: requires a 1.1 GiB data repository
-       #:configure-flags '("-DBUILD_STATIC_LIBS=OFF")))
+     '(#:configure-flags
+       (list
+        "-DBUILD_DOC=ON"
+        "-DBUILD_STATIC_LIBS=OFF"
+        "-DBUILD_LUTS_GENERATOR=ON"
+        "-DBUILD_UNIT_TESTS=ON"
+        "-DBUILD_MJ2=ON"
+        "-DBUILD_JPWL=ON"
+        ;; To be enabled after Java becomes reproducible.
+        ;; "-DBUILD_JPIP=ON"
+        ;; "-DBUILD_JPIP_SERVER=ON"
+        ;; "-DBUILD_JAVA=ON"
+        "-DBUILD_JP3D=ON"
+        "-DBUILD_TESTING=ON"
+        (string-append "-DOPJ_DATA_ROOT="
+                       (assoc-ref %build-inputs "openjpeg-data")))
+       #:phases
+       (modify-phases %standard-phases
+         ;; To be re-enabled after upstream fixes the bug,
+         ;; https://github.com/uclouvain/openjpeg/issues/1264
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/CMakeLists.txt"
+               (("add_subdirectory\\(nonregression\\)")
+                ""))
+             #t))
+         (add-after 'install 'move-docs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share/doc"))
+               (rename-file
+                (string-append out "/share/doc/html")
+                (string-append doc "/share/doc/html"))
+               #t))))))
+    (native-inputs
+     `(("doxygen" ,doxygen)
+       ("openjpeg-data" ,openjpeg-data) ; Files for test-suite
+       ("python" ,python-wrapper)))
     (inputs
-      `(("lcms" ,lcms)
-        ("libpng" ,libpng)
-        ("libtiff" ,libtiff)
-        ("zlib" ,zlib)))
-    (synopsis "JPEG 2000 codec")
-    (description
-      "The OpenJPEG library is a JPEG 2000 codec written in C.  It has
-been developed in order to promote the use of JPEG 2000, the new
-still-image compression standard from the Joint Photographic Experts
-Group (JPEG).
-
-In addition to the basic codec, various other features are under
-development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats,
-an indexing tool useful for the JPIP protocol, JPWL-tools for
-error-resilience, a Java-viewer for j2k-images, ...")
+     `(("curl" ,curl)
+       ("fcgi" ,fcgi)
+       ("lcms" ,lcms)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("zlib" ,zlib)))
+    (synopsis "OPENJPEG Library and Applications")
+    (description "OpenJPEG is an implementation of JPEG 2000 codec written in C
+language.  It has been developed in order to promote the use of JPEG 2000, a
+still-image compression standard from the Joint Photographic Experts Group
+(JPEG).  Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a
+JPEG 2000 Reference Software.")
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:11:06 2020
Received: from localhost ([127.0.0.1]:43462 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDZ-00065j-1l
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42320)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDQ-00063G-6Y
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:57 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 7DA453367E2C;
 Thu, 20 Aug 2020 17:10:55 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update
 package definition.
Date: Thu, 20 Aug 2020 17:10:25 +0200
Message-Id: <20200820151050.9529-4-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* 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@HIDDEN>
---
 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




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:10:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:10:59 2020
Received: from localhost ([127.0.0.1]:43442 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDS-00063m-8L
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:59 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42312)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDP-00063E-KL
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:56 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id EC40E3360623;
 Thu, 20 Aug 2020 17:10:54 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition.
Date: Thu, 20 Aug 2020 17:10:23 +0200
Message-Id: <20200820151050.9529-2-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820151050.9529-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
 <20200820151050.9529-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (yelp-tools): Update package definition.
[propagated-inputs]: Move itstool, libxml2 and libxslt to ...
[native-inputs]: ... here.
[synopsis]: Modify.
[description]: Modify.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5dda82d295..881cfa493d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5775,31 +5775,27 @@ freedesktop.org help system specification.")
   (package
     (name "yelp-tools")
     (version "3.32.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (propagated-inputs
-     ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
      `(("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
        ("xmllint" ,libxml2)
        ("xsltproc" ,libxslt)))
     (inputs
      `(("yelp-xsl" ,yelp-xsl)))
+    (synopsis "Tools for Yelp")
+    (description "Yelp-Tools contains small programs that help you create, edit,
+manage, and publish your Mallard or DocBook documentation.")
     (home-page "https://wiki.gnome.org/Apps/Yelp/Tools")
-    (synopsis "Yelp documentation tools")
-    (description
-     "Yelp-tools is a collection of scripts and build utilities to help create,
-manage, and publish documentation for Yelp and the web.  Most of the heavy
-lifting is done by packages like yelp-xsl and itstool.  This package just
-wraps things up in a developer-friendly way.")
     (license license:gpl2+)))
 
 (define-public libgee




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at 42958 <at> debbugs.gnu.org:


Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:10:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:10:58 2020
Received: from localhost ([127.0.0.1]:43438 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mDQ-00063X-Sd
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:58 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:42300)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mDP-00063C-BN
 for 42958 <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:10:55 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id AB5383360398;
 Thu, 20 Aug 2020 17:10:54 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: 42958 <at> debbugs.gnu.org
Subject: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition.
Date: Thu, 20 Aug 2020 17:10:22 +0200
Message-Id: <20200820151050.9529-1-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200820150914.9443-1-dannym@HIDDEN>
References: <20200820150914.9443-1-dannym@HIDDEN>
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 42958
Cc: Raghav Gururajan <raghavgururajan@HIDDEN>,
 Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

From: Raghav Gururajan <raghavgururajan@HIDDEN>

* gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:configure-flag>[--enable-doc]: New flag.
[native-inputs]: Add mallard-ducktype, intltool and libxslt.
[description]: Modify.
[license]: Add lgpl2.1+ and expat.

Signed-off-by: Danny Milosavljevic <dannym@HIDDEN>
---
 gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 116f6d660f..5dda82d295 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5698,26 +5698,44 @@ of running programs and invoke methods on those interfaces.")
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "3.34.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))))
+    (version "3.36.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--enable-doc")))
     (native-inputs
-     `(("gettext-minimal" ,gettext-minimal)
+     `(("ducktype" ,mallard-ducktype)
+       ("gettext" ,gettext-minimal)
+       ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("xmllint" ,libxml2)))
-    (home-page "https://wiki.gnome.org/Apps/Yelp")
+       ("xmllint" ,libxml2)
+       ("xsltproc" ,libxslt)))
     (synopsis "XSL stylesheets for Yelp")
-    (description
-     "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser
-to format Docbook and Mallard documents.")
-    (license license:gpl2+)))
+    (description "Yelp-XSL is a collection of programs and data files to help
+you build, maintain, and distribute documentation.  It provides XSLT stylesheets
+that can be built upon for help viewers and publishing systems.  These
+stylesheets output JavaScript and CSS content, and reference images
+provided by yelp-xsl. It also redistributes copies of the jQuery and
+jQuery.Syntax JavaScript libraries.")
+    (home-page "https://wiki.gnome.org/Apps/Yelp")
+    (license
+     (list
+      ;; XSLT
+      license:gpl2+
+      ;; Images
+      license:lgpl2.1+
+      ;; JavaScript
+      license:expat))))
 
 (define-public yelp
   (package




Information forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 20 Aug 2020 15:09:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 20 11:09:46 2020
Received: from localhost ([127.0.0.1]:43423 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k8mCD-00060P-LS
	for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:09:46 -0400
Received: from lists.gnu.org ([209.51.188.17]:49996)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dannym@HIDDEN>) id 1k8mC7-00060D-WB
 for submit <at> debbugs.gnu.org; Thu, 20 Aug 2020 11:09:40 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:34426)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <dannym@HIDDEN>)
 id 1k8mC6-00051h-0Q
 for guix-patches@HIDDEN; Thu, 20 Aug 2020 11:09:35 -0400
Received: from dd26836.kasserver.com ([85.13.145.193]:36558)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <dannym@HIDDEN>)
 id 1k8mBw-0006UV-Oc
 for guix-patches@HIDDEN; Thu, 20 Aug 2020 11:09:33 -0400
Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at
 [80.110.126.103])
 by dd26836.kasserver.com (Postfix) with ESMTPSA id 59C253360398;
 Thu, 20 Aug 2020 17:09:19 +0200 (CEST)
From: Danny Milosavljevic <dannym@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH core-updates 00/29] Big changes from wip-desktop.
Date: Thu, 20 Aug 2020 17:09:14 +0200
Message-Id: <20200820150914.9443-1-dannym@HIDDEN>
X-Mailer: git-send-email 2.27.0
MIME-Version: 1.0
Tags: patch
Content-Transfer-Encoding: 8bit
Received-SPF: none client-ip=85.13.145.193;
 envelope-from=dannym@HIDDEN; helo=dd26836.kasserver.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 11:09:19
X-ACL-Warn: Detected OS   = Linux 3.11 and newer [fuzzy]
X-Spam_score_int: -25
X-Spam_score: -2.6
X-Spam_bar: --
X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7,
 SPF_HELO_NONE=0.001, SPF_NONE=0.001,
 URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
Cc: Danny Milosavljevic <dannym@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Some packages that were updated in wip-desktop have a lot of dependents:

#dependents package
6206 yelp-xsl
6205 yelp-tools
6188 glib
6057 gobject-introspection
6031 pixman
6025 openjpeg
6012 cairo
5908 pango
4535 texlive-bin
2625 gdk-pixbuf
2622 vala
2607 libgsf
2602 librsvg@HIDDEN
2583 atk
2582 gdk-pixbuf+svg
2581 gtk+@2.24.32
2176 wayland
2169 wayland-protocols
1932 atkmm
1931 gtkmm@HIDDEN
1912 gtk-doc
1271 json-glib
1262 at-spi2-core
1260 at-spi2-atk
1258 gtk+

Update them on core-updates.

Raghav Gururajan (29):
  gnu: yelp-xsl: Update package definition.
  gnu: yelp-tools: Update package definition.
  gnu: glib: Update package definition.
  gnu: glib-with-documentation: Update package definition.
  gnu: gobject-introspection: Update package definition.
  gnu: gobject-introspection: Propagate glib.
  gnu: gobject-introspection: Add patches back.
  gnu: pixman: Update package definition.
  gnu: openjpeg: Update package definition.
  gnu: cairo: Update package definition.
  gnu: pango: Update package definition.
  gnu: gdk-pixbuf: Update package definition.
  gnu: gdk-pixbuf: Disable failing tests.
  gnu: gdk-pixbuf+svg: Update package definition.
  gnu: vala: Update package definition.
  gnu: libgsf: Update package definition.
  gnu: librsvg@HIDDEN: Update package definition.
  gnu: atk: Update to 2.36.0.
  gnu: gtk+-2: Update package definition.
  gnu: wayland: Update package definition.
  gnu: wayland-protocols: Update package definition.
  gnu: atkmm: Update package definition.
  gnu: gtk-doc: Update package definition.
  gnu: json-glib: Update package definition.
  gnu: at-spi2-core: Update package definition.
  gnu: at-spi2-atk: Update to 2.34.2.
  gnu: gtk+: Update package definition.
  gnu: gtk+: Propagate libcloudproviders.
  gnu: gtk+: Add missing input.

 gnu/local.mk                                  |    3 +-
 gnu/packages/freedesktop.scm                  |  115 +-
 gnu/packages/glib.scm                         |  417 +++---
 gnu/packages/gnome.scm                        |  401 ++++--
 gnu/packages/gtk.scm                          | 1174 ++++++++++-------
 gnu/packages/image.scm                        |   88 +-
 .../patches/glib-disable-failing-tests.patch  |   84 ++
 gnu/packages/patches/glib-tests-timer.patch   |   15 -
 .../patches/pango-skip-libthai-test.patch     |   23 -
 gnu/packages/xdisorg.scm                      |   42 +-
 10 files changed, 1337 insertions(+), 1025 deletions(-)
 create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch
 delete mode 100644 gnu/packages/patches/glib-tests-timer.patch
 delete mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch





Acknowledgement sent to Danny Milosavljevic <dannym@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#42958; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 29 Nov 2020 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.