02/02: gnu: caribou: Fix build with gcc-14.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit 6a5c4ea159991e55822cdcf2fcda6ccbdd853d93
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jan 5 12:07:08 2025 +0100

    gnu: caribou: Fix build with gcc-14.
    
    * gnu/packages/gnome.scm (caribou)[arguments]: Use G-Expressions.  Add 
CFLAGS
    to #:configure-flags to relax gcc-14's strictness.
    
    Change-Id: I78bf5b03029112aa17977b2947e5446e90150f11
---
 gnu/packages/gnome.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5364679208..b9330d2fd0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8435,31 +8435,30 @@ Evolution (hence the name), but is now used by other 
packages as well.")
                 "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before
-          'build 'pre-build
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              ;; Use absolute shared library path in Caribou-1.0.typelib.
-              (substitute* "libcaribou/Makefile"
-                (("--shared-library=libcaribou.so")
-                 (string-append "--shared-library="
-                                out "/lib/libcaribou.so")))
-              #t)))
+     (list
+      #:configure-flags
+      #~(list "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types")
+      #:phases
+       #~(modify-phases %standard-phases
+           (add-before
+               'build 'pre-build
+             (lambda _
+               ;; Use absolute shared library path in Caribou-1.0.typelib.
+               (substitute* "libcaribou/Makefile"
+                 (("--shared-library=libcaribou.so")
+                  (string-append "--shared-library="
+                                 #$output "/lib/libcaribou.so")))))
          (add-after 'install 'wrap-programs
           (lambda* (#:key outputs #:allow-other-keys)
-            (let* ((out (assoc-ref outputs "out"))
-                   (python-path (getenv "GUIX_PYTHONPATH"))
-                   (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+            (let ((python-path (getenv "GUIX_PYTHONPATH"))
+                  (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
               (for-each
                (lambda (prog)
                  (wrap-program prog
                    `("GUIX_PYTHONPATH"      ":" prefix (,python-path))
                    `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-               (list (string-append out "/bin/caribou-preferences")
-                     (string-append out "/libexec/antler-keyboard"))))
-            #t)))))
+               (list (string-append #$output "/bin/caribou-preferences")
+                     (string-append #$output 
"/libexec/antler-keyboard")))))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
        ("gobject-introspection" ,gobject-introspection)