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

Previous Next

Package: guix-patches;

Reported by: Danny Milosavljevic <dannym <at> scratchpost.org>

Date: Thu, 20 Aug 2020 15:10:01 UTC

Severity: normal

Tags: patch

Done: Léo Le Bouter <lle-bout <at> zaclys.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42958 in the body.
You can then email your comments to 42958 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:10:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 20 Aug 2020 15:10:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: guix-patches <at> gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 00/29] Big changes from wip-desktop.
Date: Thu, 20 Aug 2020 17:09:14 +0200
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 <at> 2.40.21
2583 atk
2582 gdk-pixbuf+svg
2581 gtk+@2.24.32
2176 wayland
2169 wayland-protocols
1932 atkmm
1931 gtkmm <at> 2.24.5
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 <at> 2.40.21: 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





Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:11:04 GMT) Full text and rfc822 format available.

Message #8 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition.
Date: Thu, 20 Aug 2020 17:10:22 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:11:06 GMT) Full text and rfc822 format available.

Message #11 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition.
Date: Thu, 20 Aug 2020 17:10:23 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:11:08 GMT) Full text and rfc822 format available.

Message #14 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update
 package definition.
Date: Thu, 20 Aug 2020 17:10:25 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 gnu/packages/glib.scm | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:11:08 GMT) Full text and rfc822 format available.

Message #17 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 09/29] gnu: openjpeg: Update package definition.
Date: Thu, 20 Aug 2020 17:10:30 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:01 GMT) Full text and rfc822 format available.

Message #20 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 03/29] gnu: glib: Update package definition.
Date: Thu, 20 Aug 2020 17:10:24 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> disroot.org>
+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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:01 GMT) Full text and rfc822 format available.

Message #23 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib.
Date: Thu, 20 Aug 2020 17:10:27 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:02 GMT) Full text and rfc822 format available.

Message #26 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 10/29] gnu: cairo: Update package definition.
Date: Thu, 20 Aug 2020 17:10:31 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:02 GMT) Full text and rfc822 format available.

Message #29 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:26 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> src.gnome.org>  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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:03 GMT) Full text and rfc822 format available.

Message #32 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 15/29] gnu: vala: Update package definition.
Date: Thu, 20 Aug 2020 17:10:36 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:03 GMT) Full text and rfc822 format available.

Message #35 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 16/29] gnu: libgsf: Update package definition.
Date: Thu, 20 Aug 2020 17:10:37 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:03 GMT) Full text and rfc822 format available.

Message #38 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0.
Date: Thu, 20 Aug 2020 17:10:39 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:04 GMT) Full text and rfc822 format available.

Message #41 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 20/29] gnu: wayland: Update package definition.
Date: Thu, 20 Aug 2020 17:10:41 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:04 GMT) Full text and rfc822 format available.

Message #44 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 19/29] gnu: gtk+-2: Update package definition.
Date: Thu, 20 Aug 2020 17:10:40 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:05 GMT) Full text and rfc822 format available.

Message #47 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Date: Thu, 20 Aug 2020 17:10:43 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:05 GMT) Full text and rfc822 format available.

Message #50 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 08/29] gnu: pixman: Update package definition.
Date: Thu, 20 Aug 2020 17:10:29 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:06 GMT) Full text and rfc822 format available.

Message #53 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 24/29] gnu: json-glib: Update package definition.
Date: Thu, 20 Aug 2020 17:10:45 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:06 GMT) Full text and rfc822 format available.

Message #56 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches
 back.
Date: Thu, 20 Aug 2020 17:10:28 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> src.gnome.org>  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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:06 GMT) Full text and rfc822 format available.

Message #59 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 25/29] gnu: at-spi2-core: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:46 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:07 GMT) Full text and rfc822 format available.

Message #62 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package definition.
Date: Thu, 20 Aug 2020 17:10:33 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:07 GMT) Full text and rfc822 format available.

Message #65 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 28/29] gnu: gtk+: Propagate libcloudproviders.
Date: Thu, 20 Aug 2020 17:10:49 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:08 GMT) Full text and rfc822 format available.

Message #68 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 29/29] gnu: gtk+: Add missing input.
Date: Thu, 20 Aug 2020 17:10:50 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:08 GMT) Full text and rfc822 format available.

Message #71 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 27/29] gnu: gtk+: Update package definition.
Date: Thu, 20 Aug 2020 17:10:48 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:08 GMT) Full text and rfc822 format available.

Message #74 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 13/29] gnu: gdk-pixbuf: Disable failing tests.
Date: Thu, 20 Aug 2020 17:10:34 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:09 GMT) Full text and rfc822 format available.

Message #77 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 21/29] gnu: wayland-protocols: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:42 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:09 GMT) Full text and rfc822 format available.

Message #80 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 14/29] gnu: gdk-pixbuf+svg: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:35 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

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

Signed-off-by: Danny Milosavljevic <dannym <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:10 GMT) Full text and rfc822 format available.

Message #83 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Date: Thu, 20 Aug 2020 17:10:32 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:10 GMT) Full text and rfc822 format available.

Message #86 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 17/29] gnu: librsvg <at> 2.40.21: Update package
 definition.
Date: Thu, 20 Aug 2020 17:10:38 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:12:10 GMT) Full text and rfc822 format available.

Message #89 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates 23/29] gnu: gtk-doc: Update package definition.
Date: Thu, 20 Aug 2020 17:10:44 +0200
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 15:13:02 GMT) Full text and rfc822 format available.

Message #92 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>,
 Danny Milosavljevic <dannym <at> scratchpost.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
From: Raghav Gururajan <raghavgururajan <at> disroot.org>

* 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 <at> scratchpost.org>
---
 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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:29:02 GMT) Full text and rfc822 format available.

Message #95 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Date: Thu, 20 Aug 2020 18:27:56 +0200
[Message part 1 (text/plain, inline)]
misses libthai, but that's in master as of 5c57328ef73.

[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:30:02 GMT) Full text and rfc822 format available.

Message #98 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition.
Date: Thu, 20 Aug 2020 18:29:41 +0200
[Message part 1 (text/plain, inline)]
libthai requires libdatrie, which is on master as commit 20842b795e2.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:45:02 GMT) Full text and rfc822 format available.

Message #101 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 27/29] gnu: gtk+: Update package definition.
Date: Thu, 20 Aug 2020 18:44:41 +0200
[Message part 1 (text/plain, inline)]
libcloudprovider is not in guix core-updates yet.

guix master commit that added libcloudprovider is
63d71ff0061c2e761fbad6e67f322208d8fdf25b.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:46:01 GMT) Full text and rfc822 format available.

Message #104 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Date: Thu, 20 Aug 2020 18:45:00 +0200
[Message part 1 (text/plain, inline)]
missing import (gnu packages graphviz)
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:46:01 GMT) Full text and rfc822 format available.

Message #107 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package
 definition.
Date: Thu, 20 Aug 2020 18:45:46 +0200
[Message part 1 (text/plain, inline)]
openjpeg-data is not in guix core-updates yet, but it's in guix master.

guix master commit 3f03bd372871a95e2ebb50197172f7a95329feed added openjpeg-data.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 20 Aug 2020 16:49:01 GMT) Full text and rfc822 format available.

Message #110 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition.
Date: Thu, 20 Aug 2020 18:48:14 +0200
[Message part 1 (text/plain, inline)]
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.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Mon, 24 Aug 2020 00:20:03 GMT) Full text and rfc822 format available.

Message #113 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package
 definition.
Date: Mon, 24 Aug 2020 02:19:56 +0200
[Message part 1 (text/plain, inline)]
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 

/gnu/store/8mcjhrc6yir9gzrp0y71nj254giw75bd-libxslt-1.1.34/bin/xsltproc --nonet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --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/xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl ../gdk-pixbuf-2.40.0/docs/gdk-pixbuf-csource.xml
warning: failed to load external entity "/gnu/store/6jxdry6q9yj4rw7ska0aniqjf42b6ply-docbook-xsl-1.79.2/xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl"
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 <at> exe/timescale.c.o'.
[5/152] Generating gdk-pixbuf-enum-types.h with a meson_exe.py custom command.
[6/152] Compiling C object 'gdk-pixbuf/pixops/a255f19@@pixops <at> 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-gdk-pixbuf-2.40.0.drv' failed
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Sun, 30 Aug 2020 20:55:02 GMT) Full text and rfc822 format available.

Message #116 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>, 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: Update
 package definition.
Date: Sun, 30 Aug 2020 22:54:22 +0200
Hi!

Danny Milosavljevic <dannym <at> scratchpost.org> skribis:

> From: Raghav Gururajan <raghavgururajan <at> disroot.org>
>
> * 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 <at> scratchpost.org>

I think “Update package definition” is not descriptive: it should be
either “Update to 3.36” (for a version update), or “Move build-time tool
to 'native-inputs'”, or “Tweak synopsis and description”.  But then,
these are different kinds of changes (I know, you’ll hate me for
suggesting another rebase…).  I find it important to clearly communicate
among us what a change does.

WDYT?

Also, while it’s maybe more convenient for Outreachy, I think many of
these changes could have gone one by one on ‘master’ over time, 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 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.")

This particular change is questionable IMO.

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

Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Wed, 23 Sep 2020 13:42:01 GMT) Full text and rfc822 format available.

Message #119 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Date: Wed, 23 Sep 2020 15:40:12 +0200
[Message part 1 (text/plain, inline)]
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.

[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Wed, 23 Sep 2020 13:47:02 GMT) Full text and rfc822 format available.

Message #122 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Date: Wed, 23 Sep 2020 15:45:52 +0200
[Message part 1 (text/plain, inline)]
On Wed, 23 Sep 2020 15:40:12 +0200
Danny Milosavljevic <dannym <at> scratchpost.org> 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.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 11:37:01 GMT) Full text and rfc822 format available.

Message #125 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 42958 <at> debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan <at> disroot.org>
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package definition.
Date: Thu, 24 Sep 2020 13:36:20 +0200
[Message part 1 (text/plain, inline)]
I think doctool should not be included in gobject-introspection itself, so this
patchset is unaffected by it.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:27:01 GMT) Full text and rfc822 format available.

Message #128 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package
 definition.
Date: Thu, 24 Sep 2020 08:26:24 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0002-gnu-yelp-xsl-Update-to-3.36.0.patch (text/x-patch, attachment)]
[0003-gnu-yelp-xsl-Enable-documentation.patch (text/x-patch, attachment)]
[0004-gnu-yelp-xsl-Update-description.patch (text/x-patch, attachment)]
[0005-gnu-yelp-xsl-Update-license.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:28:02 GMT) Full text and rfc822 format available.

Message #131 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 02/29] gnu: yelp-tools: Update package
 definition.
Date: Thu, 24 Sep 2020 08:27:42 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0006-gnu-yelp-tools-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0007-gnu-yelp-tools-De-propagate-some-inputs.patch (text/x-patch, attachment)]
[0008-gnu-yelp-tools-Update-synopsis-and-description.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:30:02 GMT) Full text and rfc822 format available.

Message #134 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 03/29] gnu: glib: Update package definition.
Date: Thu, 24 Sep 2020 08:28:45 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0009-gnu-glib-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0010-gnu-glib-Update-to-2.64.3.patch (text/x-patch, attachment)]
[0011-gnu-glib-Update-synopsis-and-description.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:42:01 GMT) Full text and rfc822 format available.

Message #137 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, 
 package definition.
Date: Thu, 24 Sep 2020 08:41:50 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (text/x-patch, attachment)]
[0013-gnu-glib-with-documentation-Fix-documentation.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:52:02 GMT) Full text and rfc822 format available.

Message #140 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Raghav Gururajan <raghavgururajan <at> disroot.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 04/29] gnu:
 glib-with-documentation: Update, package definition.
Date: Thu, 24 Sep 2020 15:50:47 +0300
[Message part 1 (text/plain, inline)]
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 <at> disroot.org>
> 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
> 

> From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan <at> disroot.org>
> 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")

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)
> -- 
> 2.28.0
> 


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 12:57:01 GMT) Full text and rfc822 format available.

Message #143 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Raghav Gururajan <raghavgururajan <at> disroot.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package
 definition.
Date: Thu, 24 Sep 2020 15:55:53 +0300
[Message part 1 (text/plain, inline)]
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 <at> disroot.org>
> 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)))))

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 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 <at> disroot.org>
> +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
> 


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 13:16:02 GMT) Full text and rfc822 format available.

Message #146 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package, definition.
Date: Thu, 24 Sep 2020 09:14:58 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0015-gnu-gobject-introspection-Update-to-1.64.1.patch (text/x-patch, attachment)]
[0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 13:21:01 GMT) Full text and rfc822 format available.

Message #149 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate
 glib.
Date: Thu, 24 Sep 2020 09:20:09 -0400
@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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 13:33:01 GMT) Full text and rfc822 format available.

Message #152 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update
 package, definition.
Date: Thu, 24 Sep 2020 09:32:28 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached revised split patches.

Regards,
RG.
[0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0015-gnu-gobject-introspection-Update-to-1.64.1.patch (text/x-patch, attachment)]
[0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 13:34:02 GMT) Full text and rfc822 format available.

Message #155 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 07/29] gnu: gobject-introspection: Add
 patches, back.
Date: Thu, 24 Sep 2020 09:33:52 -0400
@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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 13:54:02 GMT) Full text and rfc822 format available.

Message #158 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Raghav Gururajan <raghavgururajan <at> disroot.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu:
 gobject-introspection: Update package, definition.
Date: Thu, 24 Sep 2020 15:52:52 +0200
[Message part 1 (text/plain, inline)]
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.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 14:18:01 GMT) Full text and rfc822 format available.

Message #161 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu:
 gobject-introspection: Update package, definition.
Date: Thu, 24 Sep 2020 10:17:24 -0400
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 <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 14:35:02 GMT) Full text and rfc822 format available.

Message #164 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 08/29] gnu: pixman: Update package definition.
Date: Thu, 24 Sep 2020 10:33:59 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0017-gnu-pixman-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0018-gnu-pixman-Update-to-0.40.0.patch (text/x-patch, attachment)]
[0019-gnu-pixman-Enable-some-features.patch (text/x-patch, attachment)]
[0020-gnu-pixman-Update-synopsis-and-description.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 15:05:02 GMT) Full text and rfc822 format available.

Message #167 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package
 definition.
Date: Thu, 24 Sep 2020 11:03:51 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0021-gnu-openjpeg-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0022-gnu-openjpeg-Enable-tests.patch (text/x-patch, attachment)]
[0023-gnu-openjpeg-Enable-documentation.patch (text/x-patch, attachment)]
[0024-gnu-openjpeg-Enable-some-features.patch (text/x-patch, attachment)]
[0025-gnu-openjpeg-Update-synopsis-and-description.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 24 Sep 2020 15:36:02 GMT) Full text and rfc822 format available.

Message #170 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: 42958 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 10/29] gnu: cairo: Update package definition.
Date: Thu, 24 Sep 2020 11:35:09 -0400
[Message part 1 (text/plain, inline)]
@Danny

Please find the attached split patches.

Regards,
RG.
[0026-gnu-cairo-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0027-gnu-cairo-Change-build-system.patch (text/x-patch, attachment)]
[0028-gnu-cairo-Move-documentation-to-separate-output.patch (text/x-patch, attachment)]
[0029-gnu-cairo-Enable-some-features.patch (text/x-patch, attachment)]
[0030-gnu-cairo-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Sun, 27 Sep 2020 10:13:01 GMT) Full text and rfc822 format available.

Message #173 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Raghav Gururajan <raghavgururajan <at> disroot.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update
 package definition.
Date: Sun, 27 Sep 2020 12:12:13 +0200
[Message part 1 (text/plain, inline)]
What about those failed tests?  Can we fix those?

If not, please add a comment in the embedded patch (where it disables the test)
why the test is disabled.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Sun, 29 Nov 2020 12:22:02 GMT) Full text and rfc822 format available.

Message #176 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Raghav Gururajan <raghavgururajan <at> disroot.org>
Cc: 42958 <at> debbugs.gnu.org, Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update
 package definition.
Date: Sun, 29 Nov 2020 13:21:10 +0100
[Message part 1 (text/plain, inline)]
Hi Raghav,

could you consider updating the patch to incorporate Efraim's changes,
if desired?
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Tue, 01 Dec 2020 21:09:02 GMT) Full text and rfc822 format available.

Message #179 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 42958 <at> debbugs.gnu.org
Subject: Re: bug#42958:  ([PATCH core-updates 00/29] Big changes from
 wip-desktop.)
Date: Tue, 1 Dec 2020 22:07:55 +0100
[Message part 1 (text/plain, inline)]
Pushed all these changes to guix master, except for:

0009-gnu-glib-Make-some-cosmetic-changes.patch
0010-gnu-glib-Update-to-2.64.3.patch
0011-gnu-glib-Update-synopsis-and-description.patch
0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch
0013-gnu-glib-with-documentation-Fix-documentation.patch
0023-gnu-openjpeg-Enable-documentation.patch
0024-gnu-openjpeg-Enable-some-features.patch
0026-gnu-cairo-Make-some-cosmetic-changes.patch
0027-gnu-cairo-Change-build-system.patch
0028-gnu-cairo-Move-documentation-to-separate-output.patch
0029-gnu-cairo-Enable-some-features.patch
0030-gnu-cairo-Update-synopsis-description-and-license.patch
*-gnu-pixman-Update-synopsis-and-description.patch

Mostly because these did not apply to master cleanly, and I've only tested the
set that did apply cleanly.

Note: first uninvolved past commit on guix master is now
commit af1225a3663e73458bf8941d8373c68f9ad6bae2.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 04 Dec 2020 06:09:02 GMT) Full text and rfc822 format available.

Message #182 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: "Raghav Gururajan" <raghavgururajan <at> disroot.org>
To: "Danny Milosavljevic" <dannym <at> scratchpost.org>
Cc: 42958 <at> debbugs.gnu.org, Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: [bug#42958]
Date: Fri, 04 Dec 2020 06:08:44 +0000
[Message part 1 (text/plain, inline)]
@Danny

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

Please find the revised patches attached, for glib and cairo.

Regards,
RG.
[0001-gnu-glib-Make-some-cosmetic-changes.patch (application/octet-stream, attachment)]
[0002-gnu-glib-Update-to-2.64.3.patch (application/octet-stream, attachment)]
[0003-gnu-glib-Update-synopsis-description-and-home-page.patch (application/octet-stream, attachment)]
[0004-gnu-glib-with-gio-patch-Make-some-cosmetic-changes.patch (application/octet-stream, attachment)]
[0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (application/octet-stream, attachment)]
[0006-gnu-glib-with-documentation-Fix-documentation-build.patch (application/octet-stream, attachment)]
[0007-gnu-cairo-Make-some-cosmetic-changes.patch (application/octet-stream, attachment)]
[0008-gnu-cairo-Change-build-system.patch (application/octet-stream, attachment)]
[0009-gnu-cairo-Move-documentation-to-separate-output.patch (application/octet-stream, attachment)]
[0010-gnu-cairo-Enable-some-features.patch (application/octet-stream, attachment)]
[0011-gnu-cairo-Update-synopsis-description-and-license.patch (application/octet-stream, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 11 Mar 2021 14:47:02 GMT) Full text and rfc822 format available.

Message #185 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: [bug#42958]
Date: Thu, 11 Mar 2021 09:45:52 -0500
[Message part 1 (text/plain, inline)]
Hi Danny!

Please find the attached patches for glib and cairo, which I re-prepared 
to be applied on current core-updates.

Regards,
RG.
[0001-gnu-yelp-xsl-Update-to-3.36.0.patch (text/x-patch, attachment)]
[0002-gnu-glib-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0003-gnu-glib-Update-to-2.64.3.patch (text/x-patch, attachment)]
[0004-gnu-glib-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (text/x-patch, attachment)]
[0006-gnu-glib-with-documentation-Fix-documentation-build.patch (text/x-patch, attachment)]
[0007-gnu-cairo-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0008-gnu-cairo-Change-build-system.patch (text/x-patch, attachment)]
[0009-gnu-cairo-Move-documentation-to-separate-output.patch (text/x-patch, attachment)]
[0010-gnu-cairo-Enable-some-features.patch (text/x-patch, attachment)]
[0011-gnu-cairo-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 12 Mar 2021 16:38:01 GMT) Full text and rfc822 format available.

Message #188 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: Big changes from wip-desktop.
Date: Fri, 12 Mar 2021 11:37:19 -0500
[Message part 1 (text/plain, inline)]
Hi Danny!

I have split and re-worked remaining patches for current core-updates. 
Please find them attached.

Regards,
RG.
[0001-gnu-gobject-introspection-Modify-arguments-and-input.patch (text/x-patch, attachment)]
[0002-gnu-pango-Add-missing-arguments.patch (text/x-patch, attachment)]
[0003-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0004-gnu-pango-Fix-indentation.patch (text/x-patch, attachment)]
[0005-gnu-pango-Add-missing-inputs.patch (text/x-patch, attachment)]
[0006-gnu-pango-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0007-gnu-gdk-pixbuf-Fix-indentation.patch (text/x-patch, attachment)]
[0008-gnu-gdk-pixbuf-Add-missing-arguments.patch (text/x-patch, attachment)]
[0009-gnu-gdk-pixbuf-Correct-inputs.patch (text/x-patch, attachment)]
[0010-gnu-gdk-pixbuf-Enable-jasper-support.patch (text/x-patch, attachment)]
[0011-gnu-gdk-pixbuf-Fix-documentation.patch (text/x-patch, attachment)]
[0012-gnu-gdk-pixbuf-Add-missing-inputs.patch (text/x-patch, attachment)]
[0013-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch (text/x-patch, attachment)]
[0014-gnu-gdk-pixbuf-Disable-failing-tests.patch (text/x-patch, attachment)]
[0015-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch (text/x-patch, attachment)]
[0016-gnu-vala-Fix-indentation.patch (text/x-patch, attachment)]
[0017-gnu-vala-Change-build-system.patch (text/x-patch, attachment)]
[0018-gnu-vala-Enable-coverage-support.patch (text/x-patch, attachment)]
[0019-gnu-vala-Fix-documentation.patch (text/x-patch, attachment)]
[0020-gnu-vala-Add-missing-inputs-and-propagate-libgvc.patch (text/x-patch, attachment)]
[0021-gnu-vala-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0022-gnu-libgsf-Change-build-system.patch (text/x-patch, attachment)]
[0023-gnu-libgsf-Make-separate-output-for-binaries.patch (text/x-patch, attachment)]
[0024-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0025-gnu-libgsf-Enable-missing-features.patch (text/x-patch, attachment)]
[0026-gnu-libgsf-Correct-inputs.patch (text/x-patch, attachment)]
[0027-gnu-libgsf-Enable-documentation.patch (text/x-patch, attachment)]
[0028-gnu-libgsf-Update-synopsis-description-home-page-and.patch (text/x-patch, attachment)]
[0029-gnu-atk-Fix-indentation.patch (text/x-patch, attachment)]
[0030-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0031-gnu-atk-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0032-gnu-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0033-gnu-atkmm-Fix-indentation.patch (text/x-patch, attachment)]
[0034-gnu-atkmm-Change-build-system.patch (text/x-patch, attachment)]
[0035-gnu-atkmm-Add-missing-inputs.patch (text/x-patch, attachment)]
[0036-gnu-atkmm-Enable-documentation.patch (text/x-patch, attachment)]
[0037-gnu-atkmm-Update-synopsis-description-home-page-and-.patch (text/x-patch, attachment)]
[0038-gnu-at-spi2-core-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0039-gnu-at-spi2-core-Add-missing-inputs.patch (text/x-patch, attachment)]
[0040-gnu-at-spi2-core-Fix-intendation.patch (text/x-patch, attachment)]
[0041-gnu-at-spi2-core-Fix-documentation.patch (text/x-patch, attachment)]
[0042-gnu-at-spi2-core-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0043-gnu-at-spi2-atk-Fix-indentation.patch (text/x-patch, attachment)]
[0044-gnu-at-spi2-atk-Update-to-2.34.2.patch (text/x-patch, attachment)]
[0045-gnu-at-spi2-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0046-gnu-gtk-2-Fix-indentation.patch (text/x-patch, attachment)]
[0047-gnu-gtk-2-Enable-tests.patch (text/x-patch, attachment)]
[0048-gnu-gtk-2-Add-missing-inputs-and-search-path.patch (text/x-patch, attachment)]
[0049-gnu-gtk-Fix-indentation.patch (text/x-patch, attachment)]
[0050-gnu-gtk-Enable-tests.patch (text/x-patch, attachment)]
[0051-gnu-gtk-Add-missing-inputs.patch (text/x-patch, attachment)]
[0052-gnu-gtk-Enable-cloud-providers-support.patch (text/x-patch, attachment)]
[0053-gnu-gtk-doc-Fix-identation.patch (text/x-patch, attachment)]
[0054-gnu-gtk-doc-Change-build-system.patch (text/x-patch, attachment)]
[0055-gnu-gtk-doc-Correct-inputs.patch (text/x-patch, attachment)]
[0056-gnu-gtk-doc-Update-to-1.32.patch (text/x-patch, attachment)]
[0057-gnu-gtk-doc-Enable-help.patch (text/x-patch, attachment)]
[0058-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch (text/x-patch, attachment)]
[0059-gnu-json-glib-Add-missing-argument.patch (text/x-patch, attachment)]
[0060-gnu-json-glib-Enable-documentation-and-man-pages.patch (text/x-patch, attachment)]
[0061-gnu-json-glib-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0062-gnu-wayland-Fix-indentation.patch (text/x-patch, attachment)]
[0063-gnu-wayland-Change-build-system.patch (text/x-patch, attachment)]
[0064-gnu-wayland-Correct-inputs.patch (text/x-patch, attachment)]
[0065-gnu-wayland-Fix-and-move-documentation.patch (text/x-patch, attachment)]
[0066-gnu-wayland-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[0067-gnu-wayland-protocols-Update-description.patch (text/x-patch, attachment)]
[0068-gnu-yelp-xsl-Enable-documentation.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 12 Mar 2021 17:20:02 GMT) Full text and rfc822 format available.

Message #191 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: Big changes from wip-desktop.
Date: Fri, 12 Mar 2021 12:19:15 -0500
[Message part 1 (text/plain, inline)]
Hi Danny!

> I have split and re-worked remaining patches for current core-updates. 
> Please find them attached.

Since we are touching glib and gtk here, I think we can use this 
opportunity to update them further on minor versions. I have attached 
the patches.

Regards,
RG.
[0001-gnu-glib-Update-to-2.64.6.patch (text/x-patch, attachment)]
[0002-gnu-gtk-Update-to-3.24.27.patch (text/x-patch, attachment)]
[0003-gnu-gtk-2-Update-to-2.24.33.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Thu, 25 Mar 2021 12:09:02 GMT) Full text and rfc822 format available.

Message #194 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>,
 Ricardo Wurmus <rekado <at> elephly.net>, Léo Le Bouter
 <lle-bout <at> zaclys.net>
Subject: Re: Big changes from wip-desktop.
Date: Thu, 25 Mar 2021 08:08:36 -0400
[Message part 1 (text/plain, inline)]
@(rekado|lle-bout|danny),

Could any of you please review and merge the attached patches to 
core-updates?

These patches has been successfully built on bayfront, from which you 
can obtain substitutes, if needed.

I will send some more patches for this #42958 by tomorrow.

It would be great if we could together finish-off this #42958 ASAP, so 
that I can bring remaining patches from wip-deskop.

P.S
Please pardon two cosmetic changes patches, which were done very long 
ago and had to use it to cleanly apply succeeding patches. Also, I must 
have used #t with lambda out of habit.

Regards,
RG.
[0001-gnu-glib-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0002-gnu-glib-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0003-gnu-glib-Enable-man-pages.patch (text/x-patch, attachment)]
[0004-gnu-glib-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (text/x-patch, attachment)]
[0006-gnu-glib-with-documentation-Fix-documentation-build.patch (text/x-patch, attachment)]
[0007-gnu-Temporarily-use-glib-without-documentation.patch (text/x-patch, attachment)]
[0008-gnu-libsigc-Update-to-3.0.6.patch (text/x-patch, attachment)]
[0009-gnu-libsigc-Enable-documentation.patch (text/x-patch, attachment)]
[0010-gnu-glibmm-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0011-gnu-glibmm-Enable-documentation.patch (text/x-patch, attachment)]
[0012-gnu-gtk-doc-Change-build-system.patch (text/x-patch, attachment)]
[0013-gnu-gtk-doc-Correct-inputs.patch (text/x-patch, attachment)]
[0014-gnu-gtk-doc-Update-to-1.32.patch (text/x-patch, attachment)]
[0015-gnu-gtk-doc-Enable-help.patch (text/x-patch, attachment)]
[0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch (text/x-patch, attachment)]
[0017-gnu-gobject-introspection-Propagate-glib.patch (text/x-patch, attachment)]
[0018-gnu-cairo-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0019-gnu-cairo-Change-build-system.patch (text/x-patch, attachment)]
[0020-gnu-cairo-Move-documentation-to-separate-output.patch (text/x-patch, attachment)]
[0021-gnu-cairo-Enable-some-features.patch (text/x-patch, attachment)]
[0022-gnu-cairo-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[0023-gnu-cairomm-Update-to-1.16.0.patch (text/x-patch, attachment)]
[0024-gnu-cairomm-Enable-documentation.patch (text/x-patch, attachment)]
[0025-gnu-pango-Add-missing-arguments.patch (text/x-patch, attachment)]
[0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0027-gnu-pango-Update-to-1.48.3.patch (text/x-patch, attachment)]
[0028-gnu-pango-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0029-gnu-pangomm-Update-to-2.48.0.patch (text/x-patch, attachment)]
[0030-gnu-pangomm-Enable-documentation.patch (text/x-patch, attachment)]
[0031-gnu-gdk-pixbuf-Add-missing-arguments.patch (text/x-patch, attachment)]
[0032-gnu-gdk-pixbuf-Correct-inputs.patch (text/x-patch, attachment)]
[0033-gnu-gdk-pixbuf-Enable-jasper-support.patch (text/x-patch, attachment)]
[0034-gnu-gdk-pixbuf-Fix-documentation.patch (text/x-patch, attachment)]
[0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch (text/x-patch, attachment)]
[0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch (text/x-patch, attachment)]
[0037-gnu-gdk-pixbuf-Disable-failing-tests.patch (text/x-patch, attachment)]
[0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch (text/x-patch, attachment)]
[0039-gnu-vala-Change-build-system.patch (text/x-patch, attachment)]
[0040-gnu-vala-Enable-coverage-support.patch (text/x-patch, attachment)]
[0041-gnu-vala-Fix-documentation.patch (text/x-patch, attachment)]
[0042-gnu-vala-Update-to-0.52.0.patch (text/x-patch, attachment)]
[0043-gnu-vala-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0044-gnu-libgsf-Change-build-system.patch (text/x-patch, attachment)]
[0045-gnu-libgsf-Make-separate-output-for-binaries.patch (text/x-patch, attachment)]
[0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0047-gnu-libgsf-Enable-missing-features.patch (text/x-patch, attachment)]
[0048-gnu-libgsf-Correct-inputs.patch (text/x-patch, attachment)]
[0049-gnu-libgsf-Enable-documentation.patch (text/x-patch, attachment)]
[0050-gnu-libgsf-Update-synopsis-description-home-page-and.patch (text/x-patch, attachment)]
[0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0052-gnu-atk-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0053-gnu-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0054-gnu-atkmm-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0055-gnu-atkmm-Enable-documentation.patch (text/x-patch, attachment)]
[0056-gnu-atkmm-Update-synopsis-description-home-page-and-.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 26 Mar 2021 01:01:02 GMT) Full text and rfc822 format available.

Message #197 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>,
 Ricardo Wurmus <rekado <at> elephly.net>, Léo Le Bouter
 <lle-bout <at> zaclys.net>
Subject: Re: Big changes from wip-desktop.
Date: Thu, 25 Mar 2021 21:00:43 -0400
[Message part 1 (text/plain, inline)]
@(rekado|lle-bout|danny)

> Could any of you please review and merge the attached patches to 
> core-updates?
> 
> These patches has been successfully built on bayfront, from which you 
> can obtain substitutes, if needed.
> 
> I will send some more patches for this #42958 by tomorrow.
> 
> It would be great if we could together finish-off this #42958 ASAP, so 
> that I can bring remaining patches from wip-deskop.
> 
> P.S
> Please pardon two cosmetic changes patches, which were done very long 
> ago and had to use it to cleanly apply succeeding patches. Also, I must 
> have used #t with lambda out of habit.

Since there was master <--> core-updates merge, here I have attached 
rebased patches. Thanks to Léo Le Bouter.

Regards,
RG.
[0001-gnu-glib-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0002-gnu-glib-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0003-gnu-glib-Enable-man-pages.patch (text/x-patch, attachment)]
[0004-gnu-glib-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (text/x-patch, attachment)]
[0006-gnu-glib-with-documentation-Fix-documentation-build.patch (text/x-patch, attachment)]
[0007-gnu-Temporarily-use-glib-without-documentation.patch (text/x-patch, attachment)]
[0008-gnu-libsigc-Update-to-3.0.6.patch (text/x-patch, attachment)]
[0009-gnu-libsigc-Enable-documentation.patch (text/x-patch, attachment)]
[0010-gnu-glibmm-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0011-gnu-glibmm-Enable-documentation.patch (text/x-patch, attachment)]
[0012-gnu-gtk-doc-Change-build-system.patch (text/x-patch, attachment)]
[0013-gnu-gtk-doc-Correct-inputs.patch (text/x-patch, attachment)]
[0014-gnu-gtk-doc-Update-to-1.32.patch (text/x-patch, attachment)]
[0015-gnu-gtk-doc-Enable-help.patch (text/x-patch, attachment)]
[0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch (text/x-patch, attachment)]
[0017-gnu-gobject-introspection-Propagate-glib.patch (text/x-patch, attachment)]
[0018-gnu-cairo-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0019-gnu-cairo-Change-build-system.patch (text/x-patch, attachment)]
[0020-gnu-cairo-Move-documentation-to-separate-output.patch (text/x-patch, attachment)]
[0021-gnu-cairo-Enable-some-features.patch (text/x-patch, attachment)]
[0022-gnu-cairo-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[0023-gnu-cairomm-Update-to-1.16.0.patch (text/x-patch, attachment)]
[0024-gnu-cairomm-Enable-documentation.patch (text/x-patch, attachment)]
[0025-gnu-pango-Add-missing-arguments.patch (text/x-patch, attachment)]
[0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0027-gnu-pango-Update-to-1.48.3.patch (text/x-patch, attachment)]
[0028-gnu-pango-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0029-gnu-pangomm-Update-to-2.48.0.patch (text/x-patch, attachment)]
[0030-gnu-pangomm-Enable-documentation.patch (text/x-patch, attachment)]
[0031-gnu-gdk-pixbuf-Add-missing-arguments.patch (text/x-patch, attachment)]
[0032-gnu-gdk-pixbuf-Correct-inputs.patch (text/x-patch, attachment)]
[0033-gnu-gdk-pixbuf-Enable-jasper-support.patch (text/x-patch, attachment)]
[0034-gnu-gdk-pixbuf-Fix-documentation.patch (text/x-patch, attachment)]
[0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch (text/x-patch, attachment)]
[0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch (text/x-patch, attachment)]
[0037-gnu-gdk-pixbuf-Disable-failing-tests.patch (text/x-patch, attachment)]
[0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch (text/x-patch, attachment)]
[0039-gnu-vala-Change-build-system.patch (text/x-patch, attachment)]
[0040-gnu-vala-Enable-coverage-support.patch (text/x-patch, attachment)]
[0041-gnu-vala-Fix-documentation.patch (text/x-patch, attachment)]
[0042-gnu-vala-Update-to-0.52.0.patch (text/x-patch, attachment)]
[0043-gnu-vala-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0044-gnu-libgsf-Change-build-system.patch (text/x-patch, attachment)]
[0045-gnu-libgsf-Make-separate-output-for-binaries.patch (text/x-patch, attachment)]
[0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0047-gnu-libgsf-Enable-missing-features.patch (text/x-patch, attachment)]
[0048-gnu-libgsf-Correct-inputs.patch (text/x-patch, attachment)]
[0049-gnu-libgsf-Enable-documentation.patch (text/x-patch, attachment)]
[0050-gnu-libgsf-Update-synopsis-description-home-page-and.patch (text/x-patch, attachment)]
[0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0052-gnu-atk-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0053-gnu-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0054-gnu-atkmm-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0055-gnu-atkmm-Enable-documentation.patch (text/x-patch, attachment)]
[0056-gnu-atkmm-Update-synopsis-description-home-page-and-.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 26 Mar 2021 20:14:01 GMT) Full text and rfc822 format available.

Message #200 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>,
 Ricardo Wurmus <rekado <at> elephly.net>, Léo Le Bouter
 <lle-bout <at> zaclys.net>
Subject: Re: Big changes from wip-desktop.
Date: Fri, 26 Mar 2021 16:12:53 -0400
[Message part 1 (text/plain, inline)]
@(rekado|lle-bout|danny)

>> Could any of you please review and merge the attached patches to 
>> core-updates?
>>
>> These patches has been successfully built on bayfront, from which you 
>> can obtain substitutes, if needed.
>>
>> I will send some more patches for this #42958 by tomorrow.
>>
>> It would be great if we could together finish-off this #42958 ASAP, so 
>> that I can bring remaining patches from wip-deskop.
>>
>> P.S
>> Please pardon two cosmetic changes patches, which were done very long 
>> ago and had to use it to cleanly apply succeeding patches. Also, I 
>> must have used #t with lambda out of habit.
> 
> Since there was master <--> core-updates merge, here I have attached 
> rebased patches. Thanks to Léo Le Bouter.

So I have attached all the patches for this batch. These are 
non-signed-off, just for the record. :)

Regards,
RG.
[0001-gnu-glib-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0002-gnu-glib-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0003-gnu-glib-Enable-man-pages.patch (text/x-patch, attachment)]
[0004-gnu-glib-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch (text/x-patch, attachment)]
[0006-gnu-glib-with-documentation-Fix-documentation-build.patch (text/x-patch, attachment)]
[0007-gnu-Temporarily-use-glib-without-documentation.patch (text/x-patch, attachment)]
[0008-gnu-libsigc-Update-to-3.0.6.patch (text/x-patch, attachment)]
[0009-gnu-libsigc-Enable-documentation.patch (text/x-patch, attachment)]
[0010-gnu-glibmm-Update-to-2.68.0.patch (text/x-patch, attachment)]
[0011-gnu-glibmm-Enable-documentation.patch (text/x-patch, attachment)]
[0012-gnu-Add-libsigc-2.patch (text/x-patch, attachment)]
[0013-gnu-glibmm-2.64-Update-to-2.64.5.patch (text/x-patch, attachment)]
[0014-gnu-gtk-doc-Change-build-system.patch (text/x-patch, attachment)]
[0015-gnu-gtk-doc-Correct-inputs.patch (text/x-patch, attachment)]
[0016-gnu-gtk-doc-Update-to-1.32.patch (text/x-patch, attachment)]
[0017-gnu-gtk-doc-Enable-help.patch (text/x-patch, attachment)]
[0018-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch (text/x-patch, attachment)]
[0019-gnu-gobject-introspection-Propagate-glib.patch (text/x-patch, attachment)]
[0020-gnu-cairo-Make-some-cosmetic-changes.patch (text/x-patch, attachment)]
[0021-gnu-cairo-Change-build-system.patch (text/x-patch, attachment)]
[0022-gnu-cairo-Move-documentation-to-separate-output.patch (text/x-patch, attachment)]
[0023-gnu-cairo-Enable-some-features.patch (text/x-patch, attachment)]
[0024-gnu-cairo-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[0025-gnu-cairomm-Update-to-1.16.0.patch (text/x-patch, attachment)]
[0026-gnu-cairomm-Enable-documentation.patch (text/x-patch, attachment)]
[0027-gnu-cairomm-1.13-Fix-build.patch (text/x-patch, attachment)]
[0028-gnu-pango-Add-missing-arguments.patch (text/x-patch, attachment)]
[0029-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0030-gnu-pango-Update-to-1.48.3.patch (text/x-patch, attachment)]
[0031-gnu-pango-Update-synopsis-description-and-home-page.patch (text/x-patch, attachment)]
[0032-gnu-pangomm-Update-to-2.48.0.patch (text/x-patch, attachment)]
[0033-gnu-pangomm-Enable-documentation.patch (text/x-patch, attachment)]
[0034-gnu-pangomm-2.42-Update-to-2.42.2.patch (text/x-patch, attachment)]
[0035-gnu-gdk-pixbuf-Add-missing-arguments.patch (text/x-patch, attachment)]
[0036-gnu-gdk-pixbuf-Correct-inputs.patch (text/x-patch, attachment)]
[0037-gnu-gdk-pixbuf-Enable-jasper-support.patch (text/x-patch, attachment)]
[0038-gnu-gdk-pixbuf-Fix-documentation.patch (text/x-patch, attachment)]
[0039-gnu-gdk-pixbuf-Update-to-2.42.4.patch (text/x-patch, attachment)]
[0040-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch (text/x-patch, attachment)]
[0041-gnu-gdk-pixbuf-Disable-failing-tests.patch (text/x-patch, attachment)]
[0042-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch (text/x-patch, attachment)]
[0043-gnu-vala-Change-build-system.patch (text/x-patch, attachment)]
[0044-gnu-vala-Enable-coverage-support.patch (text/x-patch, attachment)]
[0045-gnu-vala-Fix-documentation.patch (text/x-patch, attachment)]
[0046-gnu-vala-Update-to-0.52.0.patch (text/x-patch, attachment)]
[0047-gnu-vala-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0048-gnu-libgsf-Change-build-system.patch (text/x-patch, attachment)]
[0049-gnu-libgsf-Make-separate-output-for-binaries.patch (text/x-patch, attachment)]
[0050-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0051-gnu-libgsf-Enable-missing-features.patch (text/x-patch, attachment)]
[0052-gnu-libgsf-Correct-inputs.patch (text/x-patch, attachment)]
[0053-gnu-libgsf-Enable-documentation.patch (text/x-patch, attachment)]
[0054-gnu-libgsf-Update-synopsis-description-home-page-and.patch (text/x-patch, attachment)]
[0055-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch (text/x-patch, attachment)]
[0056-gnu-atk-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0057-gnu-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0058-gnu-atkmm-Update-to-2.36.0.patch (text/x-patch, attachment)]
[0059-gnu-atkmm-Enable-documentation.patch (text/x-patch, attachment)]
[0060-gnu-atkmm-Update-synopsis-description-home-page-and-.patch (text/x-patch, attachment)]
[0061-gnu-Add-atkmm-2.28.patch (text/x-patch, attachment)]
[0062-gnu-at-spi2-core-Update-to-2.40.0.patch (text/x-patch, attachment)]
[0063-gnu-at-spi2-core-Fix-documentation.patch (text/x-patch, attachment)]
[0064-gnu-at-spi2-core-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0065-gnu-at-spi2-atk-Update-to-2.38.0.patch (text/x-patch, attachment)]
[0066-gnu-at-spi2-atk-Update-home-page-and-license.patch (text/x-patch, attachment)]
[0067-gnu-json-glib-Update-to-1.6.2.patch (text/x-patch, attachment)]
[0068-gnu-json-glib-Enable-documentation-and-man-pages.patch (text/x-patch, attachment)]
[0069-gnu-json-glib-Update-synopsis-and-description.patch (text/x-patch, attachment)]
[0070-gnu-wayland-Update-to-1.19.0.patch (text/x-patch, attachment)]
[0071-gnu-wayland-Fix-and-move-documentation.patch (text/x-patch, attachment)]
[0072-gnu-wayland-Update-synopsis-description-and-license.patch (text/x-patch, attachment)]
[0073-gnu-wayland-protocols-Update-description.patch (text/x-patch, attachment)]
[0074-gnu-yelp-xsl-Enable-documentation.patch (text/x-patch, attachment)]
[0075-gnu-gtk-2-Enable-tests.patch (text/x-patch, attachment)]
[0076-gnu-gtk-2-Add-missing-inputs-and-search-path.patch (text/x-patch, attachment)]
[0077-gnu-gtk-2-Update-to-2.24.33.patch (text/x-patch, attachment)]
[0078-gnu-gtk-Enable-tests.patch (text/x-patch, attachment)]
[0079-gnu-gtk-Add-missing-inputs.patch (text/x-patch, attachment)]
[0080-gnu-gtk-Enable-cloud-providers-support.patch (text/x-patch, attachment)]
[0081-gnu-gtk-Update-to-3.24.27.patch (text/x-patch, attachment)]
[0082-gnu-gtkmm-Update-to-3.24.4.patch (text/x-patch, attachment)]
[0083-gnu-gtkmm-2-Fix-build.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#42958; Package guix-patches. (Fri, 26 Mar 2021 20:40:02 GMT) Full text and rfc822 format available.

Message #203 received at 42958 <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 42958 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>,
 Ricardo Wurmus <rekado <at> elephly.net>, Léo Le Bouter
 <lle-bout <at> zaclys.net>
Subject: Re: Big changes from wip-desktop.
Date: Fri, 26 Mar 2021 16:38:53 -0400
[Message part 1 (text/plain, inline)]
@(rekado|lle-bout|danny)

> So I have attached all the patches for this batch. These are 
> non-signed-off, just for the record. :)

Had to make a change to 0068. Attached the modified patch.

Regards,
RG.
[0068-gnu-json-glib-Enable-documentation-and-man-pages.patch (text/x-patch, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Reply sent to Léo Le Bouter <lle-bout <at> zaclys.net>:
You have taken responsibility. (Fri, 26 Mar 2021 21:23:02 GMT) Full text and rfc822 format available.

Notification sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
bug acknowledged by developer. (Fri, 26 Mar 2021 21:23:02 GMT) Full text and rfc822 format available.

Message #208 received at 42958-done <at> debbugs.gnu.org (full text, mbox):

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: Raghav Gururajan <rg <at> raghavgururajan.name>, 42958-done <at> debbugs.gnu.org,
 Danny Milosavljevic <dannym <at> scratchpost.org>, Ricardo Wurmus
 <rekado <at> elephly.net>
Subject: Re: Big changes from wip-desktop.
Date: Fri, 26 Mar 2021 22:22:17 +0100
[Message part 1 (text/plain, inline)]
On Fri, 2021-03-26 at 16:38 -0400, Raghav Gururajan wrote:
> @(rekado|lle-bout|danny)
> 
> > So I have attached all the patches for this batch. These are 
> > non-signed-off, just for the record. :)
> 
> Had to make a change to 0068. Attached the modified patch.
> 
> Regards,
> RG.

Reviewed, back and forth many comments over IRC with Raghav, pushed as
76b689f339c7ef6f10917e18c630189bb2449110.

Everything builds with:

$ ./pre-inst-env guix build -k -v1 glib libsigc++ glibmm gobject-
introspection cairo cairomm pango pangomm gdk-pixbuf gdk-pixbuf+svg
vala libgsf atk atkmm gtk-doc glibmm <at> 2.64 gtkmm <at> 2 cairomm <at> 1.13 wayland
yelp-xsl json-glib at-spi2-atk at-spi2-core atkmm <at> 2.28 pangomm <at> 2.42 
libsigc++@2 vala gtkmm <at> 2 wayland-protocols

The commit history is not perfect, especially the "cosmetic changes"
that also ungraft things, but we also want to move on and do this
actual GNOME 40 upgrade and it is not worth it obsessing over at the
end mostly irrelevant commit history details.

Any dependents that breaks due to these patches we will fix on core-
updates from now on.

Thanks a lot everyone! Let's upgrade GNOME to 40!!
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 24 Apr 2021 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 340 days ago.

Previous Next


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