diff mbox series

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

Message ID 180dee4ba7f31096ef76b82e007f5e4326459606.1701794891.git.vivien@planete-kraus.eu
State New
Headers show
Series [bug#67473,gnome-team,v5,01/19] gnu: gdk-pixbuf: Update to 2.42.10. | expand

Commit Message

Vivien Kraus Nov. 14, 2023, 11:35 a.m. UTC 
* 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

Comments

Maxim Cournoyer Dec. 8, 2023, 9:23 p.m. UTC | #1 
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>
diff mbox series

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,