* [bug#67169] [PATCH] gnu: glib-networking: Update to 2.76.1.
@ 2023-11-14 11:35 Vivien Kraus via Guix-patches via
2023-11-14 11:35 ` [bug#67169] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
0 siblings, 1 reply; 2+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:35 UTC (permalink / raw)
To: 67169
* 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 254804d055..4200ec843d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1284,7 +1284,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 2958da2cd9..bad6b23a90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4790,7 +4790,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/"
@@ -4798,12 +4798,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,
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#67169] [PATCH gnome-team v2] gnu: glib-networking: Update to 2.76.1.
2023-11-14 11:35 [bug#67169] [PATCH] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
@ 2023-11-14 11:35 ` Vivien Kraus via Guix-patches via
0 siblings, 0 replies; 2+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:35 UTC (permalink / raw)
To: 67169; +Cc: liliana.prikler, maxim.cournoyer, rg
* 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 254804d055..4200ec843d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1284,7 +1284,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 2958da2cd9..bad6b23a90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4790,7 +4790,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/"
@@ -4798,12 +4798,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,
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-14 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-14 11:35 [bug#67169] [PATCH] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
2023-11-14 11:35 ` [bug#67169] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
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).