branch core-updates updated: gnu: glib: Fix merge conflict resolution.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 9757f76589 gnu: glib: Fix merge conflict resolution.
9757f76589 is described below

commit 9757f7658982068e42b6e77b72a9e850cd2ea42c
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Mon Apr 22 10:01:28 2024 +0100

    gnu: glib: Fix merge conflict resolution.
    
    In 5fec94f3a3d4c67b748f11847064ed60d67c5ade.
    
    * gnu/packages/glib.scm (glib)[arguments]: Fix merge conflict resolution.
    
    Change-Id: I56b2e7c2dc1751b80f4e3dbd8e61f0d3a3a0e346
---
 gnu/packages/glib.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 73c53a166f..d8f09efd06 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -308,19 +308,18 @@ information, refer to the @samp{dbus-daemon(1)} man 
page.")))
                                "gdbus-peer.c"
                                "appinfo.c"
                                "desktop-app-info.c")
-                  (("[ \t]*g_test_add_func.*;") "")))
+                  (("[ \t]*g_test_add_func.*;") ""))
+                (unless (which "update-desktop-database")
+                  (substitute* "file.c"
+                    (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
+                (substitute* '("portal-support-snap.c")
+                  (("g_test_init .*")
+                   "return EXIT_SUCCESS;")))
               (substitute* "glib/tests/error.c"
                 ;; This test segfaults with glibc 2.38.
                 (("g_test_add_func.*new-valist/invalid.*" all)
                  (string-append "//" all "\n")))
 
-              (unless (which "update-desktop-database")
-                (substitute* "file.c"
-                  (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
-              (substitute* '("portal-support-snap.c")
-                (("g_test_init .*")
-                 "return EXIT_SUCCESS;"))
-
               #$@(if (target-x86-32?)
                      ;; Comment out parts of timer.c that fail on i686 due to
                      ;; excess precision when building with GCC 10: