GNU bug report logs -
#67473
[PATCH gnome-team 00/12] Hopefully the last world rebuild
Previous Next
Reported by: Vivien Kraus <vivien <at> planete-kraus.eu>
Date: Mon, 27 Nov 2023 02:08:02 UTC
Severity: normal
Tags: patch
Merged with 67166,
67169,
67222,
67408,
67410,
67411,
67420,
67423,
67424,
67437
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your bug report
#67473: [PATCH] gnu: glib-networking: Update to 2.76.1.
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 67169 <at> debbugs.gnu.org.
--
67473: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67473
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
Am Dienstag, dem 19.12.2023 um 13:29 -0500 schrieb Maxim Cournoyer:
> Hello,
>
> Vivien Kraus <vivien <at> 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 <at> 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 <at> 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
[Message part 3 (message/rfc822, inline)]
* 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
This bug report was last modified 1 year and 138 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.