[bug#67473] [PATCH gnome-team 00/12] Hopefully the last world rebuild

[bug#67473] [PATCH gnome-team 00/12] Hopefully the last world rebuild

[Vivien Kraus via Guix-patches via]

Dear guix,

Here are all the updates for GNOME 44.6 that rebuild the world.  Please find
annotated to the left of the summary message the issue it was originally
published to.  The last 3 have not been published as part of another issue.

Best regards,

Vivien

Vivien Kraus (12):
[67166]  gnu: gdk-pixbuf: Update to 2.42.10.
[67169]  gnu: glib-networking: Update to 2.76.1.
[67222]  gnu: gnome-backgrounds: Update to 44.0.
[67408]  gnu: gtk+: Update to 3.24.38.
[67410]  gnu: gtkmm-3: Update to 3.24.8.
[67420]  gnu: json-glib: Update to 1.6.6.
[67423]  gnu: libnotify: Update to 0.8.3.
[67424]  gnu: libsoup: Update to 3.4.4.
[67437]  gnu: mm-common: Update to 1.0.5.
  gnu: pangomm@2.46: Update to 2.46.3.
  gnu: yelp-tools: Update to 42.1.
  gnu: yelp-xsl: Update to 42.1.

 gnu/local.mk                                  |   2 -
 gnu/packages/gnome.scm                        | 109 +++++++++---------
 gnu/packages/gtk.scm                          |  24 ++--
 .../glib-networking-gnutls-binding.patch      |  21 ----
 .../mm-common-reproducible-tarball.patch      |  40 -------
 5 files changed, 65 insertions(+), 131 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch


base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
-- 
2.41.0

[bug#67473] [PATCH gnome-team 01/12] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 01/14] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.

base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 02/14] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..53b4af09f7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1287,7 +1287,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..2655bca3cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4794,7 +4794,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4802,12 +4802,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 03/14] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2655bca3cc..79bf58b568 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9804,7 +9804,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9813,7 +9813,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 04/14] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 05/14] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 06/14] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen, libxml2 and python.  Remove gtk-doc.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 79bf58b568..f8aa5adc02 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4679,7 +4679,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4687,14 +4687,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t
+           #:configure-flags #~'("-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4713,8 +4715,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4722,7 +4723,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4735,16 +4737,18 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
        (prepend docbook-xml-4.3
                 docbook-xsl
+                gi-docgen
                 gobject-introspection
-                gtk-doc
-                libxslt)))))
+                libxml2
+                libxslt
+                python)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 07/14] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f8aa5adc02..53c5b86657 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3030,7 +3030,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3039,7 +3039,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3063,10 +3063,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 07/14] gnu: libnotify: Update to 0.8.3.

[Maxim Cournoyer]

Hello,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
> [native-inputs]: Add gi-docgen.
> [home-page]: Update.
>
> Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
> ---
>  gnu/packages/gnome.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index f8aa5adc02..53c5b86657 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3030,7 +3030,7 @@ (define-public hicolor-icon-theme
>  (define-public libnotify
>    (package
>      (name "libnotify")
> -    (version "0.7.9")
> +    (version "0.8.3")
>      (source
>       (origin
>         (method url-fetch)
> @@ -3039,7 +3039,7 @@ (define-public libnotify
>                             name "-" version ".tar.xz"))
>         (sha256
>          (base32
> -         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
> +         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
>      (build-system meson-build-system)
>      (arguments
>       (list
> @@ -3063,10 +3063,11 @@ (define-public libnotify
>             gobject-introspection
>  
>             ;; For the documentation.
> +           gi-docgen
>             gtk-doc/stable
>             libxslt
>             docbook-xsl))

I'd expect the other doc related inputs (gtk-doc/libxslt/docbook) inputs
to be removed if it's been migrated to use gi-docgen?

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v3 08/14] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 53c5b86657..7baef6ae5d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5097,7 +5097,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5105,7 +5105,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5135,7 +5135,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 11/14] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 53b4af09f7..3ba93fa1af 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1658,7 +1658,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0f37204c3f..9173e7a042 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1136,7 +1136,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1144,26 +1144,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 11/14] gnu: mm-common: Update to 1.0.5.

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
> [arguments]: Convert to list of G-Expressions.
> [native-inputs]: Drop labels.
> [source]: Remove mm-common-reproducible-tarball.patch.
> * gnu/local.mk (dist_patch_DATA): Unregister it.
> * gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Just checking: the patch is removed because it was merged upstream?

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v3 11/14] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

Le dimanche 03 décembre 2023 à 12:08 -0500, Maxim Cournoyer a écrit :
> > * gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
> > [arguments]: Convert to list of G-Expressions.
> > [native-inputs]: Drop labels.
> > [source]: Remove mm-common-reproducible-tarball.patch.
> > * gnu/local.mk (dist_patch_DATA): Unregister it.
> > * gnu/packages/patches/mm-common-reproducible-tarball.patch:
> > Delete.
> 
> Just checking: the patch is removed because it was merged upstream?

A slightly different version was committed on Mon Sep 26 23:51:20 2022
+0200 by Jelle van der Waa:

7646c38d153ffdfbca2134f1d1ea524b7d07ca77

[bug#67473] [PATCH gnome-team v3 12/14] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 13/14] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9173e7a042..a17e1c1f8d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7364,26 +7364,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 13/14] gnu: yelp-tools: Update to 42.1.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> yelp-tools has changed its version scheme, so its download URL changed.
>
> * gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
> [source]: Update origin uri.
> [build-system]: Change to meson-build-system.
> [#:configure-flags]: Set -Dhelp=true.
> [propagated-inputs]: Drop labels.
> [native-inputs]: Add gettext-minimal, python, python-lxml.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v3 14/14] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a17e1c1f8d..a3fdbec5f6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7266,7 +7266,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7275,7 +7275,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7290,7 +7290,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 09/14] gnu: lbsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The libsoup-minimal comment about inkscape is irrelevant, because inkscape
uses libsoup-minimal-2.

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-test>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7baef6ae5d..090335e6ff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5004,11 +5004,10 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5016,17 +5015,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5082,9 +5081,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option named changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5097,20 +5100,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v3 09/14] gnu: lbsoup-minimal: Update to 3.4.4.

[Liliana Marie Prikler]

Am Samstag, dem 02.12.2023 um 16:08 +0100 schrieb Vivien Kraus:
> The libsoup-minimal comment about inkscape is irrelevant, because
> inkscape uses libsoup-minimal-2.
> 
> The option to build documentation has changed between libsoup 2 and
> libsoup 3. The failing socket test has been moved to a different
> file.
> 
> libsoup-minimal-2 introduces a new phase to disable tests, however
> the
> 'adjust-tests phase of libsoup-minimal must be removed. For
> simplicity, we use
> the 'adjust-tests name for the phase of all variants.
> 
> * gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
> [#:configure-flags]: Change name of docs option.
> [#:phases]<adjust-test>: Change the file name of socket test.
> (libsoup-minimal-2) [arguments]: Override #:configure-flags.
> [#:phases]: Override 'adjust-tests.
> (libsoup) [version]: Remove field.
> [source]: Remove field.
> [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.
> 
> Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
> ---
You typo'd in the subject line: it's libsoup, not lbsoup.

Lexically, the change LGTM, semantically CI may or may not have us
covered :)
Anyhow, queuing for Dec 10th.

Cheers

[bug#67473] [PATCH gnome-team v3 10/14] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 090335e6ff..0f37204c3f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5018,25 +5018,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~'("-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5086,13 +5087,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 01/19] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.

base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 02/19] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..977bcbb597 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1291,7 +1291,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..d2d95905df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4812,7 +4812,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4820,12 +4820,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 02/19] gnu: glib-networking: Update to 2.76.1.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
> [patches]: Remove.
> [native-inputs]: Add glib-bin.
> * gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
> * gnu/local.mk (dist_patch_DATA): Unregister it.
>
> Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 03/19] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d2d95905df..d9aedff159 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9827,7 +9827,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9836,7 +9836,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 03/19] gnu: gnome-backgrounds: Update to 44.0.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.
>
> Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 04/19] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 04/19] gnu: gtk+: Update to 3.24.38.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gtk.scm (gtk+): Update to 3.24.38.
>
> Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 05/19] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 05/19] gnu: gtkmm-3: Update to 3.24.8.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.
>
> Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 06/19] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9aedff159..44b487662f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4697,7 +4697,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t
+           #:configure-flags #~'("-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4731,8 +4733,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4740,7 +4741,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4753,16 +4755,13 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+       (prepend gi-docgen
+                gobject-introspection)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 06/19] gnu: json-glib: Update to 1.6.6.

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
> [arguments]: Convert to list of G-Expressions.
> [#:configure-flags]: Add -Dgtk_doc=disabled.
> [native-inputs]: Drop labels.
> (json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
> add -Dgtk_doc=enabled and -Dintrospection=enabled.
> [#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
> [native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
> libxslt.

> Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
> ---
>  gnu/packages/gnome.scm | 31 +++++++++++++++----------------
>  1 file changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index d9aedff159..44b487662f 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -4697,7 +4697,7 @@ (define-public dconf
>  (define-public json-glib-minimal
>    (package
>      (name "json-glib-minimal")
> -    (version "1.6.2")
> +    (version "1.6.6")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/json-glib/"
> @@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
>                                    "/json-glib-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
> +                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
>      (build-system meson-build-system)
>      (arguments
> -     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
> +     (list #:glib-or-gtk? #t
> +           #:configure-flags #~'("-Dgtk_doc=disabled")))

The comment is gone.  Was this intended?  Nitpick: #~(list ...) reads
better than #~'(...) to my eyes.

Otherwise,

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 07/19] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 44b487662f..de8d99d9ac 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3057,7 +3057,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3081,10 +3081,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 08/19] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index de8d99d9ac..aa52eb0f04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5118,7 +5118,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5148,7 +5148,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 08/19] gnu: libsoup: Update to 3.4.4.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
> [native-inputs]: Add gettext-minimal.
>
> Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 16/19] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 977bcbb597..5739a1ab12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1664,7 +1664,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e8daa59212..d4141399fe 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1140,7 +1140,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1148,26 +1148,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 16/19] gnu: mm-common: Update to 1.0.5.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
> [arguments]: Convert to list of G-Expressions.
> [native-inputs]: Drop labels.
> [source]: Remove mm-common-reproducible-tarball.patch.
> * gnu/local.mk (dist_patch_DATA): Unregister it.
> * gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.
>
> Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 17/19] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 18/19] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d4141399fe..62ebdaff63 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7358,26 +7358,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 18/19] gnu: yelp-tools: Update to 42.1.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> yelp-tools has changed its version scheme, so its download URL changed.
>
> * gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
> [source]: Update origin uri.
> [build-system]: Change to meson-build-system.
> [#:configure-flags]: Set -Dhelp=true.
> [propagated-inputs]: Drop labels.
> [native-inputs]: Add gettext-minimal, python, python-lxml.
>
> Change-Id: Ibc091329275959219fdcb1af47d34e40128da889

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 19/19] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 62ebdaff63..0b62f23232 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7258,7 +7258,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7267,7 +7267,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7282,7 +7282,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 19/19] gnu: yelp-xsl: Update to 42.1.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
> [description]: Ensure sentences are separated with 2 spaces.
>
> Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 09/19] gnu: libsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The libsoup-minimal comment about inkscape is irrelevant, because inkscape
uses libsoup-minimal-2.

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-tests>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index aa52eb0f04..e1cd60b26b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5017,11 +5017,10 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5029,17 +5028,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option named changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5110,20 +5113,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 09/19] gnu: libsoup-minimal: Update to 3.4.4.

[Maxim Cournoyer]

Hello,

Vivien Kraus <vivien@planete-kraus.eu> writes:

[...]

> * gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
> [#:configure-flags]: Change name of docs option.
> [#:phases]<adjust-tests>: Change the file name of socket test.
> (libsoup-minimal-2) [arguments]: Override #:configure-flags.
> [#:phases]: Override 'adjust-tests.
> (libsoup) [version]: Remove field.
> [source]: Remove field.
> [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

[...]

>               ;; These fail because "subdomain.localhost" does not resolve in
> @@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2
>                  "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
>      (arguments
>       (substitute-keyword-arguments (package-arguments libsoup-minimal)
> +       ((#:configure-flags configure-flags)
> +        ;; The option named changed between libsoup 2 and libsoup 3.
                             ^
                             name

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 10/19] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1cd60b26b..2b24453e8f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5031,25 +5031,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~(list "-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 10/19] gnu: libsoup-minimal: Update style.

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
> G-Expressions.
> * gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.
>
> Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 11/19] gnu: Deprecate libsoup-minimal.

[Vivien Kraus via Guix-patches via]

This patch makes the old libsoup-minimal a full package, by adding a "doc"
output, -Ddocs=enabled to the configure-flags, a 'move-doc phase and
gettext-minimal and gi-docgen to the native-inputs. The libsoup-minimal-2
package inherits from that and must undo all these changes on top of the
existing fixes (change origin, change tests fixes).

Finally, libsoup-minimal is re-introduced as a deprecated-package.

* gnu/packages/gnome.scm (libsoup): New variable from the old libsoup-minimal.
[outputs]: Add "out" and "doc".
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.
[#:phases]: Add 'move-doc.
[native-inputs]: Add gettext-minimal and gi-docgen.
(libsoup-minimal-2): Inherit from libsoup instead of libsoup-minimal.
[name]: Set to "libsoup-minimal".
[outputs]: Delete "doc".
[#:configure-flags]: Delete -Ddocs=enabled since the package base has docs.
[#:phases]: Replace with libsoup-minimal-2 test fixes.
[native-inputs]: Delete gettext-minimal and gi-docgen.
(libsoup-minimal): New variable.

Change-Id: Id797a568fb4a90a84260fd7727f7a57121a26a2d
---
 gnu/packages/gnome.scm | 71 +++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2b24453e8f..25d964e596 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5017,9 +5017,9 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-(define-public libsoup-minimal
+(define-public libsoup
   (package
-    (name "libsoup-minimal")
+    (name "libsoup")
     (version "3.4.4")
     (source (origin
               (method url-fetch)
@@ -5030,9 +5030,10 @@ (define-public libsoup-minimal
                (base32
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
     (arguments
      (list
-      #:configure-flags #~(list "-Ddocs=disabled")
+      #:configure-flags #~(list "-Ddocs=enabled")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'adjust-tests
@@ -5050,9 +5051,16 @@ (define-public libsoup-minimal
               (substitute* "tests/meson.build"
                 ((".*'name': 'hsts'.*") ""))
               (substitute* "tests/hsts-db-test.c"
-                ((".*/hsts-db/subdomains.*") "")))))))
+                ((".*/hsts-db/subdomains.*") ""))))
+          (add-after 'install 'move-doc
+            (lambda _
+              (mkdir-p (string-append #$output:doc "/share"))
+              (rename-file (string-append #$output "/share/doc")
+                           (string-append #$output:doc "/share/doc")))))))
     (native-inputs
-     (list `(,glib "bin") ;for glib-mkenums
+     (list gettext-minimal
+           `(,glib "bin") ;for glib-mkenums
+           gi-docgen
            gobject-introspection
            pkg-config
            python-wrapper
@@ -5083,7 +5091,8 @@ (define-public libsoup-minimal
 ;;; An older variant kept to build the 'rest' package.
 (define-public libsoup-minimal-2
   (package
-    (inherit libsoup-minimal)
+    (inherit libsoup)
+    (name "libsoup-minimal")
     (version "2.74.3")
     (source (origin
               (method url-fetch)
@@ -5093,15 +5102,17 @@ (define-public libsoup-minimal-2
               (sha256
                (base32
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
+    (outputs (delete "doc" (package-outputs libsoup)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        ;; The option named changed between libsoup 2 and libsoup 3.
         #~(cons "-Dgtk_doc=false"
-                (delete "-Ddocs=disabled" #$configure-flags)))
+                (delete "-Ddocs=enabled" #$configure-flags)))
        ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'adjust-tests
+        #~(modify-phases %standard-phases
+            ;; Cannot reuse #$phases here, because it references the "doc"
+            ;; output of this package, so Guix expects a "doc" output.
+            (add-after 'unpack 'adjust-tests
               (lambda _
                 ;; Disable the SSL test, failing since 2.68 and resolved in
                 ;; libsoup 3.
@@ -5109,43 +5120,11 @@ (define-public libsoup-minimal-2
                   (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
-       (replace "vala" vala-0.52)))))
+       (replace "vala" vala-0.52)
+       (delete "gettext-minimal" "gi-docgen")))))
 
-(define-public libsoup
-  (package/inherit libsoup-minimal
-    (name "libsoup")
-    (outputs (cons "doc" (package-outputs libsoup-minimal)))
-    (arguments
-     (substitute-keyword-arguments (package-arguments libsoup-minimal)
-       ((#:configure-flags configure-flags)
-        #~(cons "-Ddocs=enabled"
-                ;; The default value is 'auto', meaning it could be skipped.
-                (delete "-Ddocs=disabled" #$configure-flags)))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'adjust-tests
-              (lambda _
-                ;; This test fails due to missing /etc/nsswitch.conf
-                ;; in the build environment.
-                (substitute* "tests/unix-socket-test.c"
-                  ((".*/sockets/unconnected.*") ""))
-
-                ;; These fail because "subdomain.localhost" does not resolve in
-                ;; the build environment.  Moreover, the hsts-test suite fails on
-                ;; i686-linux because of errors from `session_get_uri' like
-                ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-                ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-                (substitute* "tests/meson.build"
-                  ((".*'name': 'hsts'.*") ""))
-                (substitute* "tests/hsts-db-test.c"
-                  ((".*/hsts-db/subdomains.*") ""))))
-            (add-after 'install 'move-doc
-              (lambda _
-                (mkdir-p (string-append #$output:doc "/share"))
-                (rename-file (string-append #$output "/share/doc")
-                             (string-append #$output:doc "/share/doc"))))))))
-    (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gettext-minimal gi-docgen)))))
+(define-public libsoup-minimal
+  (deprecated-package "libsoup-minimal" libsoup))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 11/19] gnu: Deprecate libsoup-minimal.

[Maxim Cournoyer]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> This patch makes the old libsoup-minimal a full package, by adding a "doc"
> output, -Ddocs=enabled to the configure-flags, a 'move-doc phase and
> gettext-minimal and gi-docgen to the native-inputs. The libsoup-minimal-2
> package inherits from that and must undo all these changes on top of the
> existing fixes (change origin, change tests fixes).
>
> Finally, libsoup-minimal is re-introduced as a deprecated-package.
>
> * gnu/packages/gnome.scm (libsoup): New variable from the old libsoup-minimal.
> [outputs]: Add "out" and "doc".
> [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.
> [#:phases]: Add 'move-doc.
> [native-inputs]: Add gettext-minimal and gi-docgen.
> (libsoup-minimal-2): Inherit from libsoup instead of libsoup-minimal.
> [name]: Set to "libsoup-minimal".
> [outputs]: Delete "doc".
> [#:configure-flags]: Delete -Ddocs=enabled since the package base has docs.
> [#:phases]: Replace with libsoup-minimal-2 test fixes.
> [native-inputs]: Delete gettext-minimal and gi-docgen.
> (libsoup-minimal): New variable.

IIUC, a minimal libsoup variant is not needed at this point since
inkscape depends on libsoup-minimal-2 rather than libsoup-minimal.

That may be true currently, but we should be ready for when a newer
Inkscape release is ready for a modern libsoup.  When this happens,
we'll still need a minimal version around, so I wouldn't remove it.
Does this make sense?

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 11/19] gnu: Deprecate libsoup-minimal.

[Vivien Kraus via Guix-patches via]

Le vendredi 08 décembre 2023 à 17:09 -0500, Maxim Cournoyer a écrit :
> IIUC, a minimal libsoup variant is not needed at this point since
> inkscape depends on libsoup-minimal-2 rather than libsoup-minimal.
> 
> That may be true currently, but we should be ready for when a newer
> Inkscape release is ready for a modern libsoup.  When this happens,
> we'll still need a minimal version around, so I wouldn't remove it.
> Does this make sense?
I don’t understand. I thought you asked for libsoup and libsoup-minimal
to be merged, because the closure size difference was not that big.
Libsoup-minimal is not removed, it is just marked deprecated. Do you
want me to drop this v5 11/19?

Vivien

[bug#67473] [PATCH gnome-team v5 11/19] gnu: Deprecate libsoup-minimal.

[Maxim Cournoyer]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Le vendredi 08 décembre 2023 à 17:09 -0500, Maxim Cournoyer a écrit :
>> IIUC, a minimal libsoup variant is not needed at this point since
>> inkscape depends on libsoup-minimal-2 rather than libsoup-minimal.
>> 
>> That may be true currently, but we should be ready for when a newer
>> Inkscape release is ready for a modern libsoup.  When this happens,
>> we'll still need a minimal version around, so I wouldn't remove it.
>> Does this make sense?
> I don’t understand. I thought you asked for libsoup and libsoup-minimal
> to be merged, because the closure size difference was not that big.
> Libsoup-minimal is not removed, it is just marked deprecated. Do you
> want me to drop this v5 11/19?

Apologies if I've contradicted my earlier replies here.  I've given this
some more thought and unless the cycle between inkscape and
libsoup-minimal (2 or 3) no longer exists, I don't think we should let
go of the minimal variant of libsoup as it's a matter of time before
inkscape depends on libsoup 3 (at which point we'd be back at square one
in terms of cycles, right?).

If my above reasoning holds, then yes, what I'm suggesting is to drop
this 11/19 and the few following commits that follow-up on it.

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v5 14/19] gnu: rhythmbox: use libsoup instead of libsoup-minimal.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (rhythmbox) [inputs]: Replace libsoup-minimal with
libsoup.

Change-Id: I8b3cb32123482471b637c3ba4cce7da093d17a6c
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 25d964e596..e8daa59212 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6778,7 +6778,7 @@ (define-public rhythmbox
            libpeas
            libsecret
            libmtp
-           libsoup-minimal
+           libsoup
            libxml2
            lirc
            pango
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 15/19] gnu: tuba: Replace libsoup-minimal with libsoup.

[Vivien Kraus via Guix-patches via]

* gnu/packages/mastodon.scm (tuba) [inputs]: Replace libsoup-minimal with libsoup.

Change-Id: I575bc4d446f7e0c030de2324c77a24111f940969
---
 gnu/packages/mastodon.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index cbeccdb402..d766979070 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -131,7 +131,7 @@ (define-public tuba
            json-glib
            libadwaita
            libgee
-           libsoup-minimal
+           libsoup
            libsecret
            libwebp
            libxml2
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 13/19] gnu: python-nbxmpp: Replace libsoup-minimal with libsoup.

[Vivien Kraus via Guix-patches via]

* gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Replace libsoup-minimal
with libsoup.

Change-Id: I6010fc2974961a892683072bad093e8320e173d7
---
 gnu/packages/messaging.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1c5bc4bbd7..54ae080463 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1110,7 +1110,7 @@ (define-public python-nbxmpp
     (inputs
      (list glib
            glib-networking
-           libsoup-minimal
+           libsoup
            python-gssapi
            python-idna
            python-precis-i18n
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 12/19] gnu: gnuais: Replace libsoup-minimal with libsoup.

[Vivien Kraus via Guix-patches via]

* gnu/packages/radio.scm (gnuais) [inputs]: Replace libsoup-minimal with libsoup.

Change-Id: Ib4da18883af077168b17f55d9966f0704a2d60cc
---
 gnu/packages/radio.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 486244e154..e6d8eb9ab9 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2170,7 +2170,7 @@ (define-public gnuais
      `(("alsa-lib" ,alsa-lib)
        ("curl" ,curl)
        ("gtk+" ,gtk+)
-       ("libsoup" ,libsoup-minimal)
+       ("libsoup" ,libsoup)
        ("mariadb-lib" ,mariadb "lib")
        ("osm-gps-map" ,osm-gps-map)
        ("pulseaudio" ,pulseaudio)))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v5 01/19] gnu: gdk-pixbuf: Update to 2.42.10.

[Maxim Cournoyer]

Hi!

Note: it'd be nice if you could add a cover-letter to your series; this
way I could review it whole and reply a single time with my reviewed-by
tag :-).

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
> [#:configure-flags]: Add "-Dgtk_doc=true".
> [native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
> gi-docgen and python-docutils.
>
> Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team 02/12] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..53b4af09f7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1287,7 +1287,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..2655bca3cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4794,7 +4794,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4802,12 +4802,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team 03/12] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2655bca3cc..79bf58b568 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9804,7 +9804,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9813,7 +9813,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team 04/12] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team 05/12] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team 06/12] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen, libxml2 and python.  Remove gtk-doc.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 79bf58b568..f8aa5adc02 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4679,7 +4679,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4687,14 +4687,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t
+           #:configure-flags #~'("-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4713,8 +4715,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4722,7 +4723,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4735,16 +4737,18 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
        (prepend docbook-xml-4.3
                 docbook-xsl
+                gi-docgen
                 gobject-introspection
-                gtk-doc
-                libxslt)))))
+                libxml2
+                libxslt
+                python)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team 07/12] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f8aa5adc02..53c5b86657 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3030,7 +3030,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3039,7 +3039,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3063,10 +3063,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team 08/12] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 53c5b86657..7baef6ae5d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5097,7 +5097,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5105,7 +5105,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5135,7 +5135,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team 08/12] gnu: libsoup: Update to 3.4.4.

[Liliana Marie Prikler]

Am Freitag, dem 24.11.2023 um 00:58 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
> [native-inputs]: Add gettext-minimal.
> 
> Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
> ---
>  gnu/packages/gnome.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 53c5b86657..7baef6ae5d 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -5097,7 +5097,7 @@ (define-public libsoup-minimal-2
>  (define-public libsoup
>    (package/inherit libsoup-minimal
>      (name "libsoup")
> -    (version "3.1.4")
> +    (version "3.4.4")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/libsoup/"
> @@ -5105,7 +5105,7 @@ (define-public libsoup
Just noticed this, we should probably unify libsoup and libsoup-
minimal, no?

[bug#67473] [PATCH gnome-team 09/12] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 53b4af09f7..3ba93fa1af 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1658,7 +1658,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7baef6ae5d..f33e460336 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1136,7 +1136,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1144,26 +1144,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team 10/12] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team 11/12] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f33e460336..2eafbfefef 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7367,26 +7367,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team 12/12] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2eafbfefef..3834f30074 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7269,7 +7269,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7278,7 +7278,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7293,7 +7293,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 00/14] Remaining GNOME 44 updates

[Vivien Kraus via Guix-patches via]

Dear guix,

You asked for a commit message update, and for removal of gtk-doc / xslt /
docbook when gi-docgen is used.

I updated the commit messages, removed these inputs from gdk-pixbuf and
json-glib, but not from libnotify, as the latter still uses both systems.

I also noticed that libnotify did not have the changed URL; this is required
because the website does not exist anymore.

Best regards,

Vivien

Vivien Kraus (14):
  gnu: gdk-pixbuf: Update to 2.42.10.
  gnu: glib-networking: Update to 2.76.1.
  gnu: gnome-backgrounds: Update to 44.0.
  gnu: gtk+: Update to 3.24.38.
  gnu: gtkmm-3: Update to 3.24.8.
  gnu: json-glib: Update to 1.6.6.
  gnu: libnotify: Update to 0.8.3.
  gnu: libsoup: Update to 3.4.4.
  gnu: libsoup-minimal: Update to 3.4.4.
  gnu: libsoup-minimal: Update style.
  gnu: mm-common: Update to 1.0.5.
  gnu: pangomm@2.46: Update to 2.46.3.
  gnu: yelp-tools: Update to 42.1.
  gnu: yelp-xsl: Update to 42.1.

 gnu/local.mk                                  |   2 -
 gnu/packages/gnome.scm                        | 181 +++++++++---------
 gnu/packages/gtk.scm                          |  24 ++-
 .../glib-networking-gnutls-binding.patch      |  21 --
 .../mm-common-reproducible-tarball.patch      |  40 ----
 5 files changed, 97 insertions(+), 171 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch


base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 01/14] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 02/14] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..977bcbb597 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1291,7 +1291,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..d2d95905df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4812,7 +4812,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4820,12 +4820,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 03/14] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d2d95905df..d9aedff159 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9827,7 +9827,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9836,7 +9836,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 04/14] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 05/14] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 06/14] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9aedff159..44b487662f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4697,7 +4697,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t
+           #:configure-flags #~'("-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4731,8 +4733,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4740,7 +4741,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4753,16 +4755,13 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+       (prepend gi-docgen
+                gobject-introspection)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 07/14] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 44b487662f..de8d99d9ac 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3057,7 +3057,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3081,10 +3081,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 08/14] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index de8d99d9ac..aa52eb0f04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5118,7 +5118,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5148,7 +5148,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 11/14] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 977bcbb597..5739a1ab12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1664,7 +1664,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 062d27c8a1..9dd7cf9754 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1140,7 +1140,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1148,26 +1148,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 12/14] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 13/14] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9dd7cf9754..be63e75762 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7379,26 +7379,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 14/14] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index be63e75762..3165f31b88 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7279,7 +7279,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7288,7 +7288,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7303,7 +7303,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 09/14] gnu: libsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The libsoup-minimal comment about inkscape is irrelevant, because inkscape
uses libsoup-minimal-2.

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-tests>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index aa52eb0f04..e1cd60b26b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5017,11 +5017,10 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5029,17 +5028,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option named changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5110,20 +5113,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 10/14] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1cd60b26b..062d27c8a1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5031,25 +5031,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~'("-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v4 00/14] Remaining GNOME 44 updates

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Dear guix,
>
> You asked for a commit message update, and for removal of gtk-doc / xslt /
> docbook when gi-docgen is used.
>
> I updated the commit messages, removed these inputs from gdk-pixbuf and
> json-glib, but not from libnotify, as the latter still uses both systems.
>
> I also noticed that libnotify did not have the changed URL; this is required
> because the website does not exist anymore.
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (14):
>   gnu: gdk-pixbuf: Update to 2.42.10.
>   gnu: glib-networking: Update to 2.76.1.
>   gnu: gnome-backgrounds: Update to 44.0.
>   gnu: gtk+: Update to 3.24.38.
>   gnu: gtkmm-3: Update to 3.24.8.
>   gnu: json-glib: Update to 1.6.6.
>   gnu: libnotify: Update to 0.8.3.
>   gnu: libsoup: Update to 3.4.4.
>   gnu: libsoup-minimal: Update to 3.4.4.
>   gnu: libsoup-minimal: Update style.
>   gnu: mm-common: Update to 1.0.5.
>   gnu: pangomm@2.46: Update to 2.46.3.
>   gnu: yelp-tools: Update to 42.1.
>   gnu: yelp-xsl: Update to 42.1.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v6 00/14] Gnome-team world rebuild

[Vivien Kraus via Guix-patches via]

Dear guix,

Here is the new revision, with a cover letter.

What do you think?

Best regards,

Vivien

Vivien Kraus (14):
  gnu: gdk-pixbuf: Update to 2.42.10.
  gnu: glib-networking: Update to 2.76.1.
  gnu: gnome-backgrounds: Update to 44.0.
  gnu: gtk+: Update to 3.24.38.
  gnu: gtkmm-3: Update to 3.24.8.
  gnu: json-glib: Update to 1.6.6.
  gnu: libnotify: Update to 0.8.3.
  gnu: libsoup: Update to 3.4.4.
  gnu: libsoup-minimal: Update to 3.4.4.
  gnu: libsoup-minimal: Update style.
  gnu: mm-common: Update to 1.0.5.
  gnu: pangomm@2.46: Update to 2.46.3.
  gnu: yelp-tools: Update to 42.1.
  gnu: yelp-xsl: Update to 42.1.

 gnu/local.mk                                  |   2 -
 gnu/packages/gnome.scm                        | 181 +++++++++---------
 gnu/packages/gtk.scm                          |  24 ++-
 .../glib-networking-gnutls-binding.patch      |  21 --
 .../mm-common-reproducible-tarball.patch      |  40 ----
 5 files changed, 97 insertions(+), 171 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch


base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 01/14] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 02/14] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..977bcbb597 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1291,7 +1291,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..d2d95905df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4812,7 +4812,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4820,12 +4820,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 03/14] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d2d95905df..d9aedff159 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9827,7 +9827,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9836,7 +9836,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 04/14] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 05/14] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 06/14] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9aedff159..4a4a452d48 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4697,7 +4697,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t            ;to wrap binaries, compile schemas
+           #:configure-flags #~(list "-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4731,8 +4733,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4740,7 +4741,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4753,16 +4755,13 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+       (prepend gi-docgen
+                gobject-introspection)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 07/14] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a4a452d48..5cf73eeea7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3057,7 +3057,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3081,10 +3081,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 08/14] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5cf73eeea7..33089b4acf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5118,7 +5118,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5148,7 +5148,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 11/14] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 977bcbb597..5739a1ab12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1664,7 +1664,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 507ee78690..5c79a7b6d3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1140,7 +1140,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1148,26 +1148,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 12/14] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 13/14] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c79a7b6d3..7695fe58b3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7379,26 +7379,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 14/14] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7695fe58b3..00226c936a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7279,7 +7279,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7288,7 +7288,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7303,7 +7303,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 09/14] gnu: libsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The libsoup-minimal comment about inkscape is irrelevant, because inkscape
uses libsoup-minimal-2.

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-tests>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 33089b4acf..dd3d92ae2d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5017,11 +5017,10 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5029,17 +5028,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option name changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5110,20 +5113,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 10/14] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dd3d92ae2d..507ee78690 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5031,25 +5031,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~(list "-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v6 00/14] Gnome-team world rebuild

[Liliana Marie Prikler]

Am Samstag, dem 09.12.2023 um 20:37 +0100 schrieb Vivien Kraus:
> Dear guix,
> 
> Here is the new revision, with a cover letter.
> 
> What do you think?
Hi,

I have this locally on my tree right now, with a few slightly reworded
commit messages.  I'd like to push it today with a few of the other
issues that have accumulated (remind me to take a look at qa.guix).

Maxim, WDYT?

[bug#67473] [PATCH gnome-team v6 00/14] Gnome-team world rebuild

[Vivien Kraus via Guix-patches via]

Hello,

Le dimanche 10 décembre 2023 à 11:40 +0100, Liliana Marie Prikler a
écrit :
> I'd like to push it today with a few of the other
> issues that have accumulated (remind me to take a look at qa.guix).

I think QA might be unreliable to get an accurate list of issues.
issues.guix.gnu.org seems to have more:

https://issues.guix.gnu.org/search?query=gnome-team+is:open

> Maxim, WDYT?
This is a gentle reminder that we are waiting for you :)

Best regards,

Vivien

[bug#67473] [PATCH gnome-team v6 00/14] Gnome-team world rebuild

[Liliana Marie Prikler]

Am Mittwoch, dem 13.12.2023 um 22:33 +0100 schrieb Vivien Kraus:
> Hello,
> 
> Le dimanche 10 décembre 2023 à 11:40 +0100, Liliana Marie Prikler a
> écrit :
> > I'd like to push it today with a few of the other
> > issues that have accumulated (remind me to take a look at qa.guix).
> 
> I think QA might be unreliable to get an accurate list of issues.
> issues.guix.gnu.org seems to have more:
> 
> https://issues.guix.gnu.org/search?query=gnome-team+is:open
I know that query.  I'm using QA to get the subset that is known to
build "reliably", whatever that means.  I don't think pushing nearly
unreviewed series on top of this would be a great idea.

> 
Cheers

[bug#67473] [PATCH gnome-team v7 00/15] World-rebuilding updates for GNOME 44.7

[Vivien Kraus via Guix-patches via]

Dear guix,

GNOME 44.7 releases with a new Vala. I added it to the series.

What do you think?

Best regards,

Vivien

Vivien Kraus (15):
  gnu: gdk-pixbuf: Update to 2.42.10.
  gnu: glib-networking: Update to 2.76.1.
  gnu: gnome-backgrounds: Update to 44.0.
  gnu: gtk+: Update to 3.24.38.
  gnu: gtkmm-3: Update to 3.24.8.
  gnu: json-glib: Update to 1.6.6.
  gnu: libnotify: Update to 0.8.3.
  gnu: libsoup: Update to 3.4.4.
  gnu: libsoup-minimal: Update to 3.4.4.
  gnu: libsoup-minimal: Update style.
  gnu: mm-common: Update to 1.0.5.
  gnu: pangomm@2.46: Update to 2.46.3.
  gnu: vala: Update to 0.56.14.
  gnu: yelp-tools: Update to 42.1.
  gnu: yelp-xsl: Update to 42.1.

 gnu/local.mk                                  |   2 -
 gnu/packages/gnome.scm                        | 185 +++++++++---------
 gnu/packages/gtk.scm                          |  24 ++-
 .../glib-networking-gnutls-binding.patch      |  21 --
 .../mm-common-reproducible-tarball.patch      |  40 ----
 5 files changed, 99 insertions(+), 173 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch


base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 01/15] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 02/15] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..977bcbb597 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1291,7 +1291,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..d2d95905df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4812,7 +4812,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4820,12 +4820,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 03/15] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d2d95905df..d9aedff159 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9827,7 +9827,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9836,7 +9836,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 04/15] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 05/15] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 06/15] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9aedff159..4a4a452d48 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4697,7 +4697,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t            ;to wrap binaries, compile schemas
+           #:configure-flags #~(list "-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4731,8 +4733,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4740,7 +4741,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4753,16 +4755,13 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+       (prepend gi-docgen
+                gobject-introspection)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 07/15] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a4a452d48..5cf73eeea7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3057,7 +3057,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3081,10 +3081,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 08/15] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5cf73eeea7..33089b4acf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5118,7 +5118,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5148,7 +5148,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 11/15] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 977bcbb597..5739a1ab12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1664,7 +1664,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 507ee78690..5c79a7b6d3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1140,7 +1140,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1148,26 +1148,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 12/15] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 14/15] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2e0a24cdbf..f51167969f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7379,26 +7379,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 15/15] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f51167969f..c41ef7cba7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7279,7 +7279,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7288,7 +7288,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7303,7 +7303,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 09/15] gnu: libsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The libsoup-minimal comment about inkscape is irrelevant, because inkscape
uses libsoup-minimal-2.

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-tests>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 33089b4acf..dd3d92ae2d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5017,11 +5017,10 @@ (define-public libshumate
 as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
     (license license:lgpl2.1+)))
 
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5029,17 +5028,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option name changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5110,20 +5113,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 09/15] gnu: libsoup-minimal: Update to 3.4.4.

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> The libsoup-minimal comment about inkscape is irrelevant, because inkscape
> uses libsoup-minimal-2.

I'd keep the comment, as the cycle between inkscape and libsoup-minimal
(not considering versions) still exits; it's a matter of time until
inkscape depends on libsoup-minimal v3 rather than libsoup-minimal v2.

[...]

> -;;; A minimal version of libsoup used to prevent a cycle with Inkscape.

I'd keep this comment (and remove the text from the commit message
mentioning it was obsolete).

-- 
Thanks,
Maxim

[bug#67473] [PATCH gnome-team v7 10/15] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dd3d92ae2d..507ee78690 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5031,25 +5031,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~(list "-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 13/15] gnu: vala: Update to 0.56.14.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (vala): Update to 0.56.14.

Change-Id: I7701c7f68fcac9421de11673c7b15379185be213
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c79a7b6d3..2e0a24cdbf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4444,7 +4444,7 @@ (define-public seahorse
 (define-public vala
   (package
     (name "vala")
-    (version "0.56.13")
+    (version "0.56.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/vala/"
@@ -4452,7 +4452,7 @@ (define-public vala
                                   "vala-" version ".tar.xz"))
               (sha256
                (base32
-                "01xfarnhpp30wmv9mwayw8751glwppl0sva79j3y9qf76qq25229"))))
+                "0mzmldhf6474dp2jkxj160kkafdz32c2l5f8xnm05p4vr9lc50lk"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#67473] [PATCH gnome-team v7 00/15] World-rebuilding updates for GNOME 44.7

[Maxim Cournoyer]

Hello,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Dear guix,
>
> GNOME 44.7 releases with a new Vala. I added it to the series.
>
> What do you think?
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (15):
>   gnu: gdk-pixbuf: Update to 2.42.10.
>   gnu: glib-networking: Update to 2.76.1.
>   gnu: gnome-backgrounds: Update to 44.0.
>   gnu: gtk+: Update to 3.24.38.
>   gnu: gtkmm-3: Update to 3.24.8.
>   gnu: json-glib: Update to 1.6.6.
>   gnu: libnotify: Update to 0.8.3.
>   gnu: libsoup: Update to 3.4.4.
>   gnu: libsoup-minimal: Update to 3.4.4.
>   gnu: libsoup-minimal: Update style.
>   gnu: mm-common: Update to 1.0.5.
>   gnu: pangomm@2.46: Update to 2.46.3.
>   gnu: vala: Update to 0.56.14.
>   gnu: yelp-tools: Update to 42.1.
>   gnu: yelp-xsl: Update to 42.1.
>
>  gnu/local.mk                                  |   2 -

I only had a small comment for "09/15 gnu: libsoup-minimal: Update to
3.4.4", so:

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

(this being in reply to the cover letter meaning it's for the whole
series, per "info --index-search=Reviewed-by guix")

-- 
Thanks,
Maxim

bug#67473: [PATCH gnome-team v7 00/15] World-rebuilding updates for GNOME 44.7

[Liliana Marie Prikler]

Am Dienstag, dem 19.12.2023 um 13:29 -0500 schrieb Maxim Cournoyer:
> Hello,
> 
> Vivien Kraus <vivien@planete-kraus.eu> writes:
> 
> > Dear guix,
> > 
> > GNOME 44.7 releases with a new Vala. I added it to the series.
> > 
> > What do you think?
> > 
> > Best regards,
> > 
> > Vivien
> > 
> > Vivien Kraus (15):
> >   gnu: gdk-pixbuf: Update to 2.42.10.
> >   gnu: glib-networking: Update to 2.76.1.
> >   gnu: gnome-backgrounds: Update to 44.0.
> >   gnu: gtk+: Update to 3.24.38.
> >   gnu: gtkmm-3: Update to 3.24.8.
> >   gnu: json-glib: Update to 1.6.6.
> >   gnu: libnotify: Update to 0.8.3.
> >   gnu: libsoup: Update to 3.4.4.
> >   gnu: libsoup-minimal: Update to 3.4.4.
> >   gnu: libsoup-minimal: Update style.
> >   gnu: mm-common: Update to 1.0.5.
> >   gnu: pangomm@2.46: Update to 2.46.3.
> >   gnu: vala: Update to 0.56.14.
> >   gnu: yelp-tools: Update to 42.1.
> >   gnu: yelp-xsl: Update to 42.1.
> > 
> >  gnu/local.mk                                  |   2 -
> 
> I only had a small comment for "09/15 gnu: libsoup-minimal: Update to
> 3.4.4", so:
> 
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
> 
> (this being in reply to the cover letter meaning it's for the whole
> series, per "info --index-search=Reviewed-by guix")
Pushed v8, which addresses your comment.

Thanks everyone for your work and patience.

Cheers

[bug#67473] [PATCH gnome-team v8 00/15] GNOME 44.7 world rebuild, keeping the inkscape comment

[Vivien Kraus via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

Dear guix,

This revision updated the “gnu: libsoup-minimal: Update to 3.4.4.” commit so
that we acknowledge that libsoup-minimal is still there to break the inkscape
loop, as suggested by Maxim.

Thank you for your precious time in this busy season!

Best regards,

Vivien

Vivien Kraus (15):
  gnu: gdk-pixbuf: Update to 2.42.10.
  gnu: glib-networking: Update to 2.76.1.
  gnu: gnome-backgrounds: Update to 44.0.
  gnu: gtk+: Update to 3.24.38.
  gnu: gtkmm-3: Update to 3.24.8.
  gnu: json-glib: Update to 1.6.6.
  gnu: libnotify: Update to 0.8.3.
  gnu: libsoup: Update to 3.4.4.
* gnu: libsoup-minimal: Update to 3.4.4.
  gnu: libsoup-minimal: Update style.
  gnu: mm-common: Update to 1.0.5.
  gnu: pangomm@2.46: Update to 2.46.3.
  gnu: vala: Update to 0.56.14.
  gnu: yelp-tools: Update to 42.1.
  gnu: yelp-xsl: Update to 42.1.

 gnu/local.mk                                  |   2 -
 gnu/packages/gnome.scm                        | 184 +++++++++---------
 gnu/packages/gtk.scm                          |  24 ++-
 .../glib-networking-gnutls-binding.patch      |  21 --
 .../mm-common-reproducible-tarball.patch      |  40 ----
 5 files changed, 99 insertions(+), 172 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch


base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 01/15] gnu: gdk-pixbuf: Update to 2.42.10.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10.
[#:configure-flags]: Add "-Dgtk_doc=true".
[native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add
gi-docgen and python-docutils.

Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689
---
 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 b5246c8b3b..f6952f7f9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -691,7 +691,7 @@ (define-public gtksourceview-3
 (define-public gdk-pixbuf
   (package
     (name "gdk-pixbuf")
-    (version "2.42.8")
+    (version "2.42.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -699,12 +699,12 @@ (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44"))))
+                "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:glib-or-gtk? #t             ; To wrap binaries and/or compile schemas
-       #:configure-flags '("-Dinstalled_tests=false")
+       #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'disable-failing-tests
@@ -741,10 +741,8 @@ (define-public gdk-pixbuf
            pkg-config
 
            ;; For the documentation.
-           docbook-xml-4.3
-           docbook-xsl
-           libxml2                      ;for XML_CATALOG_FILES
-           libxslt))                    ;for xsltproc
+           gi-docgen
+           python-docutils))
     (native-search-paths
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 02/15] gnu: glib-networking: Update to 2.76.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  9 ++++----
 .../glib-networking-gnutls-binding.patch      | 21 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..977bcbb597 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1291,7 +1291,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
-  %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..d2d95905df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4812,7 +4812,7 @@ (define-public libxklavier
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.72.2")
+    (version "2.76.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4820,12 +4820,11 @@ (define-public glib-networking
                                   "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
-                "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
-              (patches
-               (search-patches "glib-networking-gnutls-binding.patch"))))
+                "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list `(,glib "bin") ; for gio-querymodules
+           pkg-config gettext-minimal))
     (inputs
      (list glib gnutls gsettings-desktop-schemas libproxy))
     (home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2.  The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int   argc,
-               setup_connection, test_connection_missing_server_identity, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
-               setup_connection, test_peer_certificate_notify, teardown_connection);
--  g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
--              setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
-               setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
-   g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 03/15] gnu: gnome-backgrounds: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0.

Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d2d95905df..d9aedff159 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9827,7 +9827,7 @@ (define-public baobab
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -9836,7 +9836,7 @@ (define-public gnome-backgrounds
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc"))))
+         "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa"))))
     (build-system meson-build-system)
     (native-inputs (list gettext-minimal))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 04/15] gnu: gtk+: Update to 3.24.38.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtk+): Update to 3.24.38.

Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f6952f7f9b..243e7865ae 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -991,7 +991,7 @@ (define-public gtk+
   (package
     (inherit gtk+-2)
     (name "gtk+")
-    (version "3.24.37")
+    (version "3.24.38")
     (source
      (origin
        (method url-fetch)
@@ -1000,7 +1000,7 @@ (define-public gtk+
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
+         "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff"))
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     ;; There is no "doc" output, because adding gtk-doc here would introduce a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 05/15] gnu: gtkmm-3: Update to 3.24.8.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8.

Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 243e7865ae..6f78f09eb1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1872,7 +1872,7 @@ (define-public gtkmm-3
   (package
     (inherit gtkmm)
     (name "gtkmm")
-    (version "3.24.6")
+    (version "3.24.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@ (define-public gtkmm-3
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"))))
+        (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j"))))
     (propagated-inputs
      `(("atkmm-2.28" ,atkmm-2.28)
        ("cairomm-1.14" ,cairomm-1.14)
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 06/15] gnu: json-glib: Update to 1.6.6.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9aedff159..4a4a452d48 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4697,7 +4697,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.2")
+    (version "1.6.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4705,14 +4705,16 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t))           ; To wrap binaries and/or compile schemas
+     (list #:glib-or-gtk? #t            ;to wrap binaries, compile schemas
+           #:configure-flags #~(list "-Dgtk_doc=disabled")))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib" ,glib "bin")             ;for glib-mkenums and glib-genmarshal
-       ("pkg-config" ,pkg-config)))
+     (list
+      gettext-minimal
+      `(,glib "bin")                     ;for glib-mkenums and glib-genmarshal
+      pkg-config))
     (inputs
      (list bash-minimal))
     (propagated-inputs
@@ -4731,8 +4733,7 @@ (define-public json-glib
     (arguments
      (substitute-keyword-arguments (package-arguments json-glib-minimal)
        ((#:configure-flags _)
-        #~(list "-Ddocs=true"
-                "-Dman=true"
+        #~(list "-Dman=true"
                 #$@(if (%current-target-system)
                        ;; If enabled, gtkdoc-scangobj will try to execute a
                        ;; cross-compiled binary.
@@ -4740,7 +4741,8 @@ (define-public json-glib
                           ;; Trying to build introspection data when cross-compiling
                           ;; causes errors during linking.
                           "-Dintrospection=disabled")
-                       #~())))
+                       #~("-Dgtk_doc=enabled"
+                          "-Dintrospection=enabled"))))
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             ;; When cross-compiling, there are no docs to move.
@@ -4753,16 +4755,13 @@ (define-public json-glib
                         (lambda _
                           (mkdir-p (string-append #$output:doc "/share"))
                           (rename-file
-                           (string-append #$output "/share/gtk-doc")
+                           (string-append #$output "/share/doc")
                            (string-append #$output:doc
-                                          "/share/gtk-doc"))))))))))
+                                          "/share/doc"))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+       (prepend gi-docgen
+                gobject-introspection)))))
 
 (define-public libxklavier
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 07/15] gnu: libnotify: Update to 0.8.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libnotify): Update to 0.8.3.
[native-inputs]: Add gi-docgen.
[home-page]: Update.

Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a4a452d48..5cf73eeea7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme
 (define-public libnotify
   (package
     (name "libnotify")
-    (version "0.7.9")
+    (version "0.8.3")
     (source
      (origin
        (method url-fetch)
@@ -3057,7 +3057,7 @@ (define-public libnotify
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+         "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3081,10 +3081,11 @@ (define-public libnotify
            gobject-introspection
 
            ;; For the documentation.
+           gi-docgen
            gtk-doc/stable
            libxslt
            docbook-xsl))
-    (home-page "https://developer-next.gnome.org/libnotify/")
+    (home-page "https://gitlab.gnome.org/GNOME/libnotify/")
     (synopsis "GNOME desktop notification library")
     (description
      "Libnotify is a library that sends desktop notifications to a
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 08/15] gnu: libsoup: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup): Update to 3.4.4.
[native-inputs]: Add gettext-minimal.

Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5cf73eeea7..33089b4acf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.1.4")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5118,7 +5118,7 @@ (define-public libsoup
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
@@ -5148,7 +5148,7 @@ (define-public libsoup
                 (rename-file (string-append #$output "/share/doc")
                              (string-append #$output:doc "/share/doc"))))))))
     (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
-                     (prepend gi-docgen)))))
+                     (prepend gettext-minimal gi-docgen)))))
 
 (define-public libsecret
   (package
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 11/15] gnu: mm-common: Update to 1.0.5.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (mm-common): Update to 1.0.5.
[arguments]: Convert to list of G-Expressions.
[native-inputs]: Drop labels.
[source]: Remove mm-common-reproducible-tarball.patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete.

Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 31 ++++++--------
 .../mm-common-reproducible-tarball.patch      | 40 -------------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 977bcbb597..5739a1ab12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1664,7 +1664,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mit-krb5-hurd.patch			\
   %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch	\
   %D%/packages/patches/mixxx-system-googletest-benchmark.patch	\
-  %D%/packages/patches/mm-common-reproducible-tarball.patch	\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cac5e0c3b7..f0d14c4582 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1140,7 +1140,7 @@ (define-public metacity
 (define-public mm-common
   (package
     (name "mm-common")
-    (version "1.0.3")
+    (version "1.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/mm-common/"
@@ -1148,26 +1148,21 @@ (define-public mm-common
                                   "mm-common-" version ".tar.xz"))
               (sha256
                (base32
-                "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8"))
-              (patches
-               (search-patches
-                "mm-common-reproducible-tarball.patch"))))
+                "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "util/mm-common-prepare.in"
-               (("ln") (search-input-file inputs "/bin/ln"))
-               (("cp") (search-input-file inputs "/bin/cp"))
-               (("sed") (search-input-file inputs "/bin/sed"))
-               (("cat") (search-input-file inputs "/bin/cat"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "util/mm-common-prepare.in"
+                (("ln") (search-input-file inputs "/bin/ln"))
+                (("cp") (search-input-file inputs "/bin/cp"))
+                (("sed") (search-input-file inputs "/bin/sed"))
+                (("cat") (search-input-file inputs "/bin/cat"))))))))
     (native-inputs
-     `(("coreutils" ,coreutils)
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)
-       ("sed" ,sed)))
+     (list coreutils gettext-minimal pkg-config sed))
     (inputs
      (list python))
     (synopsis "Module of GNOME C++ bindings")
diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch
deleted file mode 100644
index f0890aaf57..0000000000
--- a/gnu/packages/patches/mm-common-reproducible-tarball.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@reproducible-builds.org>
-Date: Sat, 12 Dec 2020 04:05:56 +0000
-Original-Patch: https://bugs.debian.org/977177
-Subject: [PATCH] Set uid, username, gid, and group name on files in
- generated tarball.
-
-The user and group may otherwise vary between builds on different systems.
-
----
- util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
-index db9e650..89049b6 100755
---- a/util/meson_aux/skeletonmm-tarball.py
-+++ b/util/meson_aux/skeletonmm-tarball.py
-@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
- else:
-   mode = 'w'
- 
-+def reproducible(tarinfo):
-+  # Set consistent user and group on files in the tar archive
-+  tarinfo.uid = 0
-+  tarinfo.uname = 'root'
-+  tarinfo.gid = 0
-+  tarinfo.gname = 'root'
-+  return tarinfo
-+
- with tarfile.open(output_file, mode=mode) as tar_file:
-   os.chdir(source_dir) # Input filenames are relative to source_dir.
-   for file in sys.argv[3:]:
--    tar_file.add(file)
-+    tar_file.add(file, filter=reproducible)
- # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
- # that the command failed, despite exit(0).
- sys.exit(0)
--- 
-2.29.2
-
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 12/15] gnu: pangomm@2.46: Update to 2.46.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3

Change-Id: I53c19722ba403790b8e110433fc31753817b5d22
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6f78f09eb1..0f634663e8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1719,7 +1719,7 @@ (define-public pangomm-2.46
   (package
     (inherit pangomm)
     (name "pangomm")
-    (version "2.46.2")
+    (version "2.46.3")
     (source
      (origin
        (method url-fetch)
@@ -1728,7 +1728,7 @@ (define-public pangomm-2.46
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p"))))
+        (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1"))))
     (propagated-inputs
      (list cairomm-1.14 glibmm-2.64 pango))))
 
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 14/15] gnu: yelp-tools: Update to 42.1.

[Vivien Kraus via Guix-patches via]

yelp-tools has changed its version scheme, so its download URL changed.

* gnu/packages/gnome.scm (yelp-tools): Update to 42.1.
[source]: Update origin uri.
[build-system]: Change to meson-build-system.
[#:configure-flags]: Set -Dhelp=true.
[propagated-inputs]: Drop labels.
[native-inputs]: Add gettext-minimal, python, python-lxml.

Change-Id: Ibc091329275959219fdcb1af47d34e40128da889
---
 gnu/packages/gnome.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ffbf2cdfaf..8cecbd7238 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7380,26 +7380,26 @@ (define-public yelp
 (define-public yelp-tools
   (package
     (name "yelp-tools")
-    (version "3.32.2")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://gnome/sources/" name "/"
-                       (version-major+minor version) "/"
+                       (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"))))
-    (build-system gnu-build-system)
+        (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-Dhelp=true")))
     (native-inputs
-     (list pkg-config))
+     (list gettext-minimal pkg-config python python-lxml))
     (inputs
      (list yelp-xsl))
     (propagated-inputs
      ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
-     `(("itstool" ,itstool)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)))
+     (list itstool libxml2 libxslt))
     (synopsis "Yelp documentation tools")
     (description
      "Yelp-tools is a collection of scripts and build utilities to help create,
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 15/15] gnu: yelp-xsl: Update to 42.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (yelp-xsl): Update to 42.1.
[description]: Ensure sentences are separated with 2 spaces.

Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8cecbd7238..ae3fa27162 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7280,7 +7280,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7289,7 +7289,7 @@ (define-public yelp-xsl
                        (version-major version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8"))))
+        (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-doc")))
@@ -7304,7 +7304,7 @@ (define-public yelp-xsl
 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
+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
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 09/15] gnu: libsoup-minimal: Update to 3.4.4.

[Vivien Kraus via Guix-patches via]

The option to build documentation has changed between libsoup 2 and libsoup 3.
The failing socket test has been moved to a different file.

libsoup-minimal-2 introduces a new phase to disable tests, however the
'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use
the 'adjust-tests name for the phase of all variants.

* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4.
[#:configure-flags]: Change name of docs option.
[#:phases]<adjust-tests>: Change the file name of socket test.
(libsoup-minimal-2) [arguments]: Override #:configure-flags.
[#:phases]: Override 'adjust-tests.
(libsoup) [version]: Remove field.
[source]: Remove field.
[#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled.

Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32
---
 gnu/packages/gnome.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 33089b4acf..87a326575e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5021,7 +5021,7 @@ (define-public libshumate
 (define-public libsoup-minimal
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5029,17 +5029,17 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
+     `(#:configure-flags '("-Ddocs=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
            (lambda _
              ;; This test fails due to missing /etc/nsswitch.conf
              ;; in the build environment.
-             (substitute* "tests/socket-test.c"
+             (substitute* "tests/unix-socket-test.c"
                ((".*/sockets/unconnected.*") ""))
 
              ;; These fail because "subdomain.localhost" does not resolve in
@@ -5095,9 +5095,13 @@ (define-public libsoup-minimal-2
                 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
+       ((#:configure-flags configure-flags)
+        ;; The option name changed between libsoup 2 and libsoup 3.
+        #~(cons "-Dgtk_doc=false"
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-tests
+           (replace 'adjust-tests
              (lambda _
                ;; Disable the SSL test, failing since 2.68 and resolved in
                ;; libsoup 3.
@@ -5110,20 +5114,13 @@ (define-public libsoup-minimal-2
 (define-public libsoup
   (package/inherit libsoup-minimal
     (name "libsoup")
-    (version "3.4.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (outputs (cons "doc" (package-outputs libsoup-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libsoup-minimal)
        ((#:configure-flags configure-flags)
-        #~(delete "-Dgtk_doc=false" #$configure-flags))
+        #~(cons "-Ddocs=enabled"
+                ;; The default value is 'auto', meaning it could be skipped.
+                (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 10/15] gnu: libsoup-minimal: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 87a326575e..cac5e0c3b7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5032,25 +5032,26 @@ (define-public libsoup-minimal
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Ddocs=disabled")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-tests
-           (lambda _
-             ;; This test fails due to missing /etc/nsswitch.conf
-             ;; in the build environment.
-             (substitute* "tests/unix-socket-test.c"
-               ((".*/sockets/unconnected.*") ""))
-
-             ;; These fail because "subdomain.localhost" does not resolve in
-             ;; the build environment.  Moreover, the hsts-test suite fails on
-             ;; i686-linux because of errors from `session_get_uri' like
-             ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
-             ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
-             (substitute* "tests/meson.build"
-               ((".*'name': 'hsts'.*") ""))
-             (substitute* "tests/hsts-db-test.c"
-               ((".*/hsts-db/subdomains.*") "")))))))
+     (list
+      #:configure-flags #~(list "-Ddocs=disabled")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-tests
+            (lambda _
+              ;; This test fails due to missing /etc/nsswitch.conf
+              ;; in the build environment.
+              (substitute* "tests/unix-socket-test.c"
+                ((".*/sockets/unconnected.*") ""))
+
+              ;; These fail because "subdomain.localhost" does not resolve in
+              ;; the build environment.  Moreover, the hsts-test suite fails on
+              ;; i686-linux because of errors from `session_get_uri' like
+              ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
+              ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
+              (substitute* "tests/meson.build"
+                ((".*'name': 'hsts'.*") ""))
+              (substitute* "tests/hsts-db-test.c"
+                ((".*/hsts-db/subdomains.*") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
@@ -5100,13 +5101,13 @@ (define-public libsoup-minimal-2
         #~(cons "-Dgtk_doc=false"
                 (delete "-Ddocs=disabled" #$configure-flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'adjust-tests
-             (lambda _
-               ;; Disable the SSL test, failing since 2.68 and resolved in
-               ;; libsoup 3.
-               (substitute* "tests/meson.build"
-                 (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                ;; Disable the SSL test, failing since 2.68 and resolved in
+                ;; libsoup 3.
+                (substitute* "tests/meson.build"
+                  (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
     (native-inputs
      (modify-inputs (package-native-inputs libsoup-minimal)
        (replace "vala" vala-0.52)))))
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 13/15] gnu: vala: Update to 0.56.14.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (vala): Update to 0.56.14.

Change-Id: I7701c7f68fcac9421de11673c7b15379185be213
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f0d14c4582..ffbf2cdfaf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4444,7 +4444,7 @@ (define-public seahorse
 (define-public vala
   (package
     (name "vala")
-    (version "0.56.13")
+    (version "0.56.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/vala/"
@@ -4452,7 +4452,7 @@ (define-public vala
                                   "vala-" version ".tar.xz"))
               (sha256
                (base32
-                "01xfarnhpp30wmv9mwayw8751glwppl0sva79j3y9qf76qq25229"))))
+                "0mzmldhf6474dp2jkxj160kkafdz32c2l5f8xnm05p4vr9lc50lk"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#67473] [PATCH gnome-team v8 00/15] GNOME 44.7 world rebuild, keeping the inkscape comment

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Dear guix,
>
> This revision updated the “gnu: libsoup-minimal: Update to 3.4.4.” commit so
> that we acknowledge that libsoup-minimal is still there to break the inkscape
> loop, as suggested by Maxim.
>
> Thank you for your precious time in this busy season!
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (15):
>   gnu: gdk-pixbuf: Update to 2.42.10.
>   gnu: glib-networking: Update to 2.76.1.
>   gnu: gnome-backgrounds: Update to 44.0.
>   gnu: gtk+: Update to 3.24.38.
>   gnu: gtkmm-3: Update to 3.24.8.
>   gnu: json-glib: Update to 1.6.6.
>   gnu: libnotify: Update to 0.8.3.
>   gnu: libsoup: Update to 3.4.4.
> * gnu: libsoup-minimal: Update to 3.4.4.
>   gnu: libsoup-minimal: Update style.
>   gnu: mm-common: Update to 1.0.5.
>   gnu: pangomm@2.46: Update to 2.46.3.
>   gnu: vala: Update to 0.56.14.
>   gnu: yelp-tools: Update to 42.1.
>   gnu: yelp-xsl: Update to 42.1.
>
>  gnu/local.mk                                  |   2 -

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim