unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
@ 2023-11-14 11:35 ` Vivien Kraus via Guix-patches via
  2023-11-14 20:17 ` [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0 Vivien Kraus via Guix-patches via
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:35 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
  2023-11-14 11:35 ` [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
@ 2023-11-14 20:17 ` Vivien Kraus via Guix-patches via
  2023-11-23 18:22 ` [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38 Vivien Kraus via Guix-patches via
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 20:17 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
  2023-11-14 11:35 ` [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
  2023-11-14 20:17 ` [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0 Vivien Kraus via Guix-patches via
@ 2023-11-23 18:22 ` Vivien Kraus via Guix-patches via
  2023-11-23 18:32 ` [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8 Vivien Kraus via Guix-patches via
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 18:22 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (2 preceding siblings ...)
  2023-11-23 18:22 ` [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38 Vivien Kraus via Guix-patches via
@ 2023-11-23 18:32 ` Vivien Kraus via Guix-patches via
  2023-11-23 23:08 ` [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 18:32 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (3 preceding siblings ...)
  2023-11-23 18:32 ` [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8 Vivien Kraus via Guix-patches via
@ 2023-11-23 23:08 ` Vivien Kraus via Guix-patches via
  2023-11-23 23:37 ` [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3 Vivien Kraus via Guix-patches via
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 23:08 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (4 preceding siblings ...)
  2023-11-23 23:08 ` [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
@ 2023-11-23 23:37 ` Vivien Kraus via Guix-patches via
  2023-11-23 23:58 ` [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4 Vivien Kraus via Guix-patches via
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 23:37 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (5 preceding siblings ...)
  2023-11-23 23:37 ` [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3 Vivien Kraus via Guix-patches via
@ 2023-11-23 23:58 ` Vivien Kraus via Guix-patches via
  2023-11-24 22:31 ` [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5 Vivien Kraus via Guix-patches via
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 23:58 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (6 preceding siblings ...)
  2023-11-23 23:58 ` [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4 Vivien Kraus via Guix-patches via
@ 2023-11-24 22:31 ` Vivien Kraus via Guix-patches via
  2023-11-26 15:18 ` [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3 Vivien Kraus via Guix-patches via
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-24 22:31 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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 904a8cacfe..8de1f1acf0 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (7 preceding siblings ...)
  2023-11-24 22:31 ` [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5 Vivien Kraus via Guix-patches via
@ 2023-11-26 15:18 ` Vivien Kraus via Guix-patches via
  2023-11-26 18:01 ` [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1 Vivien Kraus via Guix-patches via
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-26 15:18 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (8 preceding siblings ...)
  2023-11-26 15:18 ` [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3 Vivien Kraus via Guix-patches via
@ 2023-11-26 18:01 ` Vivien Kraus via Guix-patches via
  2023-11-26 18:02 ` [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: " Vivien Kraus via Guix-patches via
  2023-11-28  7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-26 18:01 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

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 8de1f1acf0..292fe2d3ec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7346,26 +7346,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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: Update to 42.1.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (9 preceding siblings ...)
  2023-11-26 18:01 ` [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1 Vivien Kraus via Guix-patches via
@ 2023-11-26 18:02 ` Vivien Kraus via Guix-patches via
  2023-11-28  7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
  11 siblings, 0 replies; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-26 18:02 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* 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 292fe2d3ec..0322fe060a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7248,7 +7248,7 @@ (define-public d-spy
 (define-public yelp-xsl
   (package
     (name "yelp-xsl")
-    (version "41.0")
+    (version "42.1")
     (source
      (origin
        (method url-fetch)
@@ -7257,7 +7257,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")))
@@ -7272,7 +7272,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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
       [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
                   ` (10 preceding siblings ...)
  2023-11-26 18:02 ` [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: " Vivien Kraus via Guix-patches via
@ 2023-11-28  7:24 ` Vivien Kraus via Guix-patches via
  2023-11-28 20:05   ` Liliana Marie Prikler
  11 siblings, 1 reply; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-28  7:24 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

* gnu/packages/gnome.scm (libsoup-minimal): Remove.
(libsoup-minimal-2): Do not inherit libsoup-minimal.
(libsoup): Inherit libsoup-minimal-2 instead of libsoup-minimal.
(rhythmbox): Replace libsoup-minimal with libsoup.
* gnu/packages/mastodon.scm (tuba) [inputs]: Same.
* gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Same.
* gnu/packages/radio.scm (gnuais) [inputs]: Same.

Change-Id: Ic57cdd0c2f7d3ceba19d7c84780b24ff2dac221f
---
 gnu/packages/gnome.scm     | 93 +++++++++++++++-----------------------
 gnu/packages/mastodon.scm  |  2 +-
 gnu/packages/messaging.scm |  2 +-
 gnu/packages/radio.scm     |  2 +-
 4 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7baef6ae5d..904a8cacfe 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
+(define-public libsoup-minimal-2
   (package
     (name "libsoup-minimal")
-    (version "3.0.7")
+    (version "2.74.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5016,34 +5015,40 @@ (define-public libsoup-minimal
                                   "libsoup-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
+                "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dgtk_doc=false")
-       #: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"
-               ((".*/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 #~'("-Dgtk_doc=false")
+      #: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"
+                ((".*/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.*") ""))
+
+              ;; Disable the SSL test, failing since 2.68 and resolved in
+              ;; libsoup 3.
+              (substitute* "tests/meson.build"
+                (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))
     (native-inputs
      (list `(,glib "bin") ;for glib-mkenums
            gobject-introspection
            pkg-config
            python-wrapper
-           vala
+           vala-0.52
            curl
            gnutls ;for 'certtool'
            httpd/pinned))
@@ -5067,35 +5072,8 @@ (define-public libsoup-minimal
 and the GLib main loop, to integrate well with GNOME applications.")
     (license license:lgpl2.0+)))
 
-;;; An older variant kept to build the 'rest' package.
-(define-public libsoup-minimal-2
-  (package
-    (inherit libsoup-minimal)
-    (version "2.74.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/libsoup/"
-                                  (version-major+minor version) "/"
-                                  "libsoup-" version ".tar.xz"))
-              (sha256
-               (base32
-                "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments libsoup-minimal)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (add-after 'unpack 'disable-failing-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)))))
-
 (define-public libsoup
-  (package/inherit libsoup-minimal
+  (package/inherit libsoup-minimal-2
     (name "libsoup")
     (version "3.4.4")
     (source (origin
@@ -5106,9 +5084,9 @@ (define-public libsoup
               (sha256
                (base32
                 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
-    (outputs (cons "doc" (package-outputs libsoup-minimal)))
+    (outputs (cons "doc" (package-outputs libsoup-minimal-2)))
     (arguments
-     (substitute-keyword-arguments (package-arguments libsoup-minimal)
+     (substitute-keyword-arguments (package-arguments libsoup-minimal-2)
        ((#:configure-flags configure-flags)
         #~(delete "-Dgtk_doc=false" #$configure-flags))
        ((#:phases phases)
@@ -5134,8 +5112,9 @@ (define-public libsoup
                 (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)))))
+    (native-inputs (modify-inputs (package-native-inputs libsoup-minimal-2)
+                     (prepend gettext-minimal gi-docgen)
+                     (replace "vala" vala)))))
 
 (define-public libsecret
   (package
@@ -6789,7 +6768,7 @@ (define-public rhythmbox
            libpeas
            libsecret
            libmtp
-           libsoup-minimal
+           libsoup
            libxml2
            lirc
            pango
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
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
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




^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-28  7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
@ 2023-11-28 20:05   ` Liliana Marie Prikler
  2023-11-28 21:26     ` Vivien Kraus via Guix-patches via
  0 siblings, 1 reply; 18+ messages in thread
From: Liliana Marie Prikler @ 2023-11-28 20:05 UTC (permalink / raw)
  To: Vivien Kraus, 67473; +Cc: rg, maxim.cournoyer

Am Dienstag, dem 28.11.2023 um 08:24 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (libsoup-minimal): Remove.
> (libsoup-minimal-2): Do not inherit libsoup-minimal.
> (libsoup): Inherit libsoup-minimal-2 instead of libsoup-minimal.
Sorry for the weird wording:  By unify, I meant unify their versions,
not making them the same package.  That being said…

> (rhythmbox): Replace libsoup-minimal with libsoup.
> * gnu/packages/mastodon.scm (tuba) [inputs]: Same.
> * gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Same.
> * gnu/packages/radio.scm (gnuais) [inputs]: Same.
> 
> Change-Id: Ic57cdd0c2f7d3ceba19d7c84780b24ff2dac221f
> ---
>  gnu/packages/gnome.scm     | 93 +++++++++++++++---------------------
> --
>  gnu/packages/mastodon.scm  |  2 +-
>  gnu/packages/messaging.scm |  2 +-
>  gnu/packages/radio.scm     |  2 +-
>  4 files changed, 39 insertions(+), 60 deletions(-)
> 
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 7baef6ae5d..904a8cacfe 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
> +(define-public libsoup-minimal-2
… is the cycle with inkscape not still a concern?
>    (package
>      (name "libsoup-minimal")
> -    (version "3.0.7")
> +    (version "2.74.3")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/libsoup/"
> @@ -5016,34 +5015,40 @@ (define-public libsoup-minimal
>                                    "libsoup-" version ".tar.xz"))
>                (sha256
>                 (base32
> -               
> "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
> +               
> "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
>      (build-system meson-build-system)
>      (arguments
> -     `(#:configure-flags '("-Dgtk_doc=false")
> -       #: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"
> -               ((".*/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 #~'("-Dgtk_doc=false")
> +      #: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"
> +                ((".*/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.*") ""))
> +
> +              ;; Disable the SSL test, failing since 2.68 and
> resolved in
> +              ;; libsoup 3.
> +              (substitute* "tests/meson.build"
> +                (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))
>      (native-inputs
>       (list `(,glib "bin") ;for glib-mkenums
>             gobject-introspection
>             pkg-config
>             python-wrapper
> -           vala
> +           vala-0.52
>             curl
>             gnutls ;for 'certtool'
>             httpd/pinned))
> @@ -5067,35 +5072,8 @@ (define-public libsoup-minimal
>  and the GLib main loop, to integrate well with GNOME applications.")
>      (license license:lgpl2.0+)))
>  
> -;;; An older variant kept to build the 'rest' package.
> -(define-public libsoup-minimal-2
> -  (package
> -    (inherit libsoup-minimal)
> -    (version "2.74.3")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (string-append "mirror://gnome/sources/libsoup/"
> -                                  (version-major+minor version) "/"
> -                                  "libsoup-" version ".tar.xz"))
> -              (sha256
> -               (base32
> -               
> "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
> -    (arguments
> -     (substitute-keyword-arguments (package-arguments libsoup-
> minimal)
> -       ((#:phases phases)
> -        `(modify-phases ,phases
> -           (add-after 'unpack 'disable-failing-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)))))
> -
>  (define-public libsoup
> -  (package/inherit libsoup-minimal
> +  (package/inherit libsoup-minimal-2
>      (name "libsoup")
>      (version "3.4.4")
>      (source (origin
> @@ -5106,9 +5084,9 @@ (define-public libsoup
>                (sha256
>                 (base32
>                 
> "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
> -    (outputs (cons "doc" (package-outputs libsoup-minimal)))
> +    (outputs (cons "doc" (package-outputs libsoup-minimal-2)))
>      (arguments
> -     (substitute-keyword-arguments (package-arguments libsoup-
> minimal)
> +     (substitute-keyword-arguments (package-arguments libsoup-
> minimal-2)
>         ((#:configure-flags configure-flags)
>          #~(delete "-Dgtk_doc=false" #$configure-flags))
>         ((#:phases phases)
> @@ -5134,8 +5112,9 @@ (define-public libsoup
>                  (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)))))
> +    (native-inputs (modify-inputs (package-native-inputs libsoup-
> minimal-2)
> +                     (prepend gettext-minimal gi-docgen)
> +                     (replace "vala" vala)))))
>  
>  (define-public libsecret
>    (package
> @@ -6789,7 +6768,7 @@ (define-public rhythmbox
>             libpeas
>             libsecret
>             libmtp
> -           libsoup-minimal
> +           libsoup
>             libxml2
>             lirc
>             pango
> 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
> 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
> 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)))

Cheers

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-28 20:05   ` Liliana Marie Prikler
@ 2023-11-28 21:26     ` Vivien Kraus via Guix-patches via
  2023-11-29  5:21       ` Liliana Marie Prikler
  0 siblings, 1 reply; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-28 21:26 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

Le mardi 28 novembre 2023 à 21:05 +0100, Liliana Marie Prikler a
écrit :
> > -;;; A minimal version of libsoup used to prevent a cycle with
> > Inkscape.
> > -(define-public libsoup-minimal
> > +(define-public libsoup-minimal-2
> … is the cycle with inkscape not still a concern?
I don’t know why the comment was there, inkscape uses libsoup-minimal-
2.




^ permalink raw reply	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-28 21:26     ` Vivien Kraus via Guix-patches via
@ 2023-11-29  5:21       ` Liliana Marie Prikler
  2023-11-29  6:25         ` Vivien Kraus via Guix-patches via
  0 siblings, 1 reply; 18+ messages in thread
From: Liliana Marie Prikler @ 2023-11-29  5:21 UTC (permalink / raw)
  To: Vivien Kraus, 67473; +Cc: rg, maxim.cournoyer

Am Dienstag, dem 28.11.2023 um 22:26 +0100 schrieb Vivien Kraus:
> Le mardi 28 novembre 2023 à 21:05 +0100, Liliana Marie Prikler a
> écrit :
> > > -;;; A minimal version of libsoup used to prevent a cycle with
> > > Inkscape.
> > > -(define-public libsoup-minimal
> > > +(define-public libsoup-minimal-2
> > … is the cycle with inkscape not still a concern?
> I don’t know why the comment was there, inkscape uses libsoup-
> minimal-2.
Hmm, it's been carried over from back then, then.  Still, there were
other users of libsoup-minimal over libsoup, so we might want to keep
the variable even as we update both to a new, shared version.

Cheers





^ permalink raw reply	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-29  5:21       ` Liliana Marie Prikler
@ 2023-11-29  6:25         ` Vivien Kraus via Guix-patches via
  2023-11-29 16:22           ` Liliana Marie Prikler
  0 siblings, 1 reply; 18+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-29  6:25 UTC (permalink / raw)
  To: Liliana Marie Prikler, 67473; +Cc: rg, maxim.cournoyer

Le mercredi 29 novembre 2023 à 06:21 +0100, Liliana Marie Prikler a
écrit :
> Still, there were
> other users of libsoup-minimal over libsoup, so we might want to keep
> the variable even as we update both to a new, shared version.
I’m tempted to say the users of libsoup-minimal used to depend on
libsoup@2, so they put libsoup-minimal-2, but then the package required
libsoup@3, and they just removed the "-2" suffix. Is there another
reason packages would want a doc-less version of libsoup?

I can make another series revision where libsoup-minimal is a
deprecated-package pointing to libsoup, or a doc-less libsoup@3. I
think the deprecated-package solution is the most useful. What do you
think?

Vivien




^ permalink raw reply	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-29  6:25         ` Vivien Kraus via Guix-patches via
@ 2023-11-29 16:22           ` Liliana Marie Prikler
  2023-12-04  1:24             ` Maxim Cournoyer
  0 siblings, 1 reply; 18+ messages in thread
From: Liliana Marie Prikler @ 2023-11-29 16:22 UTC (permalink / raw)
  To: Vivien Kraus, 67473; +Cc: rg, maxim.cournoyer

Am Mittwoch, dem 29.11.2023 um 07:25 +0100 schrieb Vivien Kraus:
> Le mercredi 29 novembre 2023 à 06:21 +0100, Liliana Marie Prikler a
> écrit :
> > Still, there were
> > other users of libsoup-minimal over libsoup, so we might want to
> > keep
> > the variable even as we update both to a new, shared version.
> I’m tempted to say the users of libsoup-minimal used to depend on
> libsoup@2, so they put libsoup-minimal-2, but then the package
> required
> libsoup@3, and they just removed the "-2" suffix. Is there another
> reason packages would want a doc-less version of libsoup?
Closure size?

> I can make another series revision where libsoup-minimal is a
> deprecated-package pointing to libsoup, or a doc-less libsoup@3. I
> think the deprecated-package solution is the most useful. What do you
> think?
I'd really like a second opinion here.  All I can say is that I don't
really trust my own gut feeling here.

Cheers




^ permalink raw reply	[flat|nested] 18+ messages in thread

* [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
  2023-11-29 16:22           ` Liliana Marie Prikler
@ 2023-12-04  1:24             ` Maxim Cournoyer
  0 siblings, 0 replies; 18+ messages in thread
From: Maxim Cournoyer @ 2023-12-04  1:24 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: rg, Vivien Kraus, 67473

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Mittwoch, dem 29.11.2023 um 07:25 +0100 schrieb Vivien Kraus:
>> Le mercredi 29 novembre 2023 à 06:21 +0100, Liliana Marie Prikler a
>> écrit :
>> > Still, there were
>> > other users of libsoup-minimal over libsoup, so we might want to
>> > keep
>> > the variable even as we update both to a new, shared version.
>> I’m tempted to say the users of libsoup-minimal used to depend on
>> libsoup@2, so they put libsoup-minimal-2, but then the package
>> required
>> libsoup@3, and they just removed the "-2" suffix. Is there another
>> reason packages would want a doc-less version of libsoup?
> Closure size?
>
>> I can make another series revision where libsoup-minimal is a
>> deprecated-package pointing to libsoup, or a doc-less libsoup@3. I
>> think the deprecated-package solution is the most useful. What do you
>> think?
> I'd really like a second opinion here.  All I can say is that I don't
> really trust my own gut feeling here.

It appears libsoup and libsoup-minimal closures differs in size by only
little (100 KiB).  So unless there is a requirement here to avoid cycles
(which if there are, would be easy to spot: byte compiling guix would
not complete and bust memory), it could be removed.

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2023-12-04  1:25 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
2023-11-14 11:35 ` [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
2023-11-14 20:17 ` [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0 Vivien Kraus via Guix-patches via
2023-11-23 18:22 ` [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38 Vivien Kraus via Guix-patches via
2023-11-23 18:32 ` [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
2023-11-23 23:37 ` [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3 Vivien Kraus via Guix-patches via
2023-11-23 23:58 ` [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4 Vivien Kraus via Guix-patches via
2023-11-24 22:31 ` [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5 Vivien Kraus via Guix-patches via
2023-11-26 15:18 ` [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3 Vivien Kraus via Guix-patches via
2023-11-26 18:01 ` [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1 Vivien Kraus via Guix-patches via
2023-11-26 18:02 ` [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: " Vivien Kraus via Guix-patches via
2023-11-28  7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
2023-11-28 20:05   ` Liliana Marie Prikler
2023-11-28 21:26     ` Vivien Kraus via Guix-patches via
2023-11-29  5:21       ` Liliana Marie Prikler
2023-11-29  6:25         ` Vivien Kraus via Guix-patches via
2023-11-29 16:22           ` Liliana Marie Prikler
2023-12-04  1:24             ` Maxim Cournoyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).