From 4af85bae2bf657eb22136d4bbdd0538ba7a8a697 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Sat, 4 Jan 2025 16:25:19 +0100 Subject: [PATCH] gnu: telepathy-glib: Fix build with gcc-14. * gnu/packages/glib.scm (telepathy-glib)[arguments]: Use G-Expressions. Add CFLAGS to #:configure-flags to relax gcc-14's strictness. Change-Id: I489e04eb8a6d1a29753f8c5fc61429f6292ae8cf --- gnu/packages/glib.scm | 57 +++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e04eedb7ba..5fa5ed80f9 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Florian Pelz -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2025 Janneke Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Petr Hodina @@ -1156,7 +1156,7 @@ (define telepathy-glib (version "0.24.2") (source (origin - (method url-fetch) + (method url-fetch) (uri (string-append "https://telepathy.freedesktop.org/releases/telepathy-glib/" @@ -1166,33 +1166,36 @@ (define telepathy-glib "1w3kja8j3gz2apal79bi3hq44xk5g78aphrqbw983l6df7bp98xh")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-vala-bindings") + (list + #:configure-flags + #~(list + "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types" + "--enable-vala-bindings") - ;; '../tools/glib-*.py' generate files but the target dependencies are - ;; (presumably) not fully specified in the makefile, leading to - ;; parallel build errors like: - ;; - ;; EOFError: EOF read where object expected - ;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1 - #:parallel-build? #f - ;; When spawned in parallel, the dbus daemons may fail to shut down - ;; cleanly. This issue appears to have been closed upstream due to low - ;; information, but still continues to haunt folks. See also - ;; . - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda _ - ;; None of the tests below are able to find the org.gtk.vfs.Daemon - ;; service file provided by gvfs. - (substitute* "tests/dbus/Makefile.in" - (("test-contacts\\$\\(EXEEXT\\)") "") - (("test-file-transfer-channel\\$\\(EXEEXT\\)") "") - (("test-stream-tube\\$\\(EXEEXT\\)") "")) - #t))))) + ;; '../tools/glib-*.py' generate files but the target dependencies are + ;; (presumably) not fully specified in the makefile, leading to + ;; parallel build errors like: + ;; + ;; EOFError: EOF read where object expected + ;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1 + #:parallel-build? #f + ;; When spawned in parallel, the dbus daemons may fail to shut down + ;; cleanly. This issue appears to have been closed upstream due to low + ;; information, but still continues to haunt folks. See also + ;; . + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; None of the tests below are able to find the org.gtk.vfs.Daemon + ;; service file provided by gvfs. + (substitute* "tests/dbus/Makefile.in" + (("test-contacts\\$\\(EXEEXT\\)") "") + (("test-file-transfer-channel\\$\\(EXEEXT\\)") "") + (("test-stream-tube\\$\\(EXEEXT\\)") ""))))))) (native-inputs - `(("glib" ,glib "bin") ; uses glib-mkenums + `(("glib" ,glib "bin") ; uses glib-mkenums ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python" ,python-2)