GNU bug report logs - #61968
[PATCH 0/7] Update GNOME Builder

Previous Next

Full log

View this message in rfc822 format

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 61968 <at> debbugs.gnu.org
Subject: [bug#61968] [PATCH v3 02/12] gnu: glib-next: Update to 2.75.4
Date: Sat, 4 Mar 2023 19:13:30 +0100

* gnu/packages/patches/glib-next-skip-failing-test.patch: New file.
* gnu/packages/glib.scm (glib-next): override patches and update to 2.75.4.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         |  7 ++++--
 .../patches/glib-next-skip-failing-test.patch | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..98b18f1026 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1209,6 +1209,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-networking-32-bit-time.patch	\
+  %D%/packages/patches/glib-next-skip-failing-test.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
   %D%/packages/patches/glibc-CVE-2019-9169.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..8f9c5dff18 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -387,7 +387,7 @@ (define-public glib-next
   (package
     (inherit glib)
     (name "glib")
-    (version "2.73.3")
+    (version "2.75.4")
     (source
      (origin
        (inherit (package-source glib))
@@ -399,7 +399,10 @@ (define-public glib-next
         '(substitute* "glib/tests/spawn-test.c"
            (("/bin/sh") "sh")))
        (sha256
-        (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+        (base32 "1lbadg7s8jn189g5wzj15nnvbf1vp68c0dx9pnys63iwiyxj9khn"))
+       (patches
+        (search-patches "glib-appinfo-watch.patch"
+                        "glib-next-skip-failing-test.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments glib)
        ((#:test-options test-options ''())
diff --git a/gnu/packages/patches/glib-next-skip-failing-test.patch b/gnu/packages/patches/glib-next-skip-failing-test.patch
new file mode 100644
index 0000000000..e8cbebeb84
--- /dev/null
+++ b/gnu/packages/patches/glib-next-skip-failing-test.patch
@@ -0,0 +1,25 @@
+diff -r -u glib-2.75.4/gio/tests/meson.build glib-fixed/gio/tests/meson.build
+--- glib-2.75.4/gio/tests/meson.build	1970-01-01 01:00:01.000000000 +0100
++++ glib-fixed/gio/tests/meson.build	2023-03-04 19:10:23.727876252 +0100
+@@ -205,9 +205,6 @@
+       'extra_sources' : ['gdbus-tests.c'],
+       'dependencies' : [dbus1_dep],
+     },
+-    'gdbus-server-auth' : {
+-      'dependencies' : [dbus1_dep],
+-    },
+   }
+ else
+   # We can build a cut-down version of this test without libdbus
+@@ -260,11 +257,6 @@
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c'],
+       'suite': ['portal-support'],
+     },
+-    'portal-support-snap' : {
+-      'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+-      'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
+-      'suite': ['portal-support'],
+-    },
+     'portal-support-snap-classic' : {
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+       'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
-- 
2.39.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.