Subject: [bug#77956] [PATCH gnome-team 02/23] gnu: glib: Update to 2.84.1.

From: Liliana Marie Prikler <[email-masked]>
Date: Mon, 21 Apr 2025 15:47:47 +0200

* gnu/packages/glib.scm (glib-minimal): Update to 2.84.1.
[#:phases]<disable-failing-tests>: Drop substitute* for testfilemonitor.
<patch-pkg-config-files>: Use map.
Also patch “lib/pkgconfig/girepository-2.0.pc”.
---
 gnu/packages/glib.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fb1acceac40..3b1e4c10500 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -246,7 +246,7 @@ (define-public dbus-verbose
 (define glib-minimal
   (package
     (name "glib")
-    (version "2.82.1")
+    (version "2.84.1")
     (source
      (origin
        (method url-fetch)
@@ -255,7 +255,7 @@ (define glib-minimal
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
+        (base32 "16kq62zrccxpdfmjn2akkvk9c0gdy9asib46bz1my6k197nc4jrb"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -298,9 +298,6 @@ (define glib-minimal
                  (string-append first " = " second "0")))))
           (add-after 'unpack 'disable-failing-tests
             (lambda _
-              (substitute* "gio/tests/meson.build"
-                ((".*'testfilemonitor'.*") ;marked as flaky
-                 ""))
               (with-directory-excursion "glib/tests"
                 (substitute* '("unix.c" "utils.c")
                   (("[ \t]*g_test_add_func.*;") "")))
@@ -478,9 +475,10 @@ (define glib-minimal
               ;; We don't patch "bindir" to point to "$bin/bin", because that
               ;; would create a reference cycle between the "out" and "bin"
               ;; outputs.
-              (substitute*
-                  (list (search-input-file outputs "lib/pkgconfig/gio-2.0.pc")
-                        (search-input-file outputs "lib/pkgconfig/glib-2.0.pc"))
+              (substitute* (map (lambda (f) (search-input-file outputs f))
+                                (list "lib/pkgconfig/gio-2.0.pc"
+                                      "lib/pkgconfig/glib-2.0.pc"
+                                      "lib/pkgconfig/girepository-2.0.pc"))
                 (("^bindir=.*")
                  "")
                 (("=\\$\\{bindir\\}/")
-- 
2.49.0