diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-22 10:01:28 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-22 10:01:28 +0100 |
| commit | 9757f7658982068e42b6e77b72a9e850cd2ea42c (patch) | |
| tree | ea6ce77547d421849b2730d970a3a76981b82999 | |
| parent | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (diff) | |
gnu: glib: Fix merge conflict resolution.
In 5fec94f3a3d4c67b748f11847064ed60d67c5ade.
* gnu/packages/glib.scm (glib)[arguments]: Fix merge conflict resolution.
Change-Id: I56b2e7c2dc1751b80f4e3dbd8e61f0d3a3a0e346
| -rw-r--r-- | gnu/packages/glib.scm | 15 |
1 files 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: |