z572 pushed a commit to branch core-packages-team
in repository guix.
commit a806c268172fcf0464e91a05ccb60cbb1b050fd6
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sat Jan 4 10:52:56 2025 +0100
gnu: xdg-desktop-portal-1.16.0: Fix build.
* gnu/packages/freedesktop.scm (xdg-desktop-portal)[native-inputs]: Use
gettext-minimal-0.21.
[arguments]: Use G-Expressions. Add phase "disable-test".
Change-Id: Id86b75543dd8451ecd4b3248411e291045df803f
---
gnu/packages/freedesktop.scm | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3d62dacbc8..3559e1e384 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -40,7 +40,7 @@
;;; Copyright © 2024 Dariqq <[email protected]>
;;; Copyright © 2024 Wilko Meyer <[email protected]>
;;; Copyright © 2024 dan <[email protected]>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
+;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3162,7 +3162,9 @@ compatible with the well-known scripts of the same name.")
("libtool" ,libtool)
("glib:bin" ,glib "bin")
("which" ,which)
- ("gettext" ,gettext-minimal)))
+ ;; Autoconf up to and including 2.72 installs a po/Makefile.in.in from
+ ;; gettext-0.18 which does not work with gettext-0.23.
+ ("gettext" ,gettext-minimal-0.21)))
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
@@ -3175,18 +3177,25 @@ compatible with the well-known scripts of the same
name.")
("pipewire" ,pipewire)
("fuse" ,fuse)))
(arguments
- `(#:configure-flags
- (list "--with-systemd=no")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'po-chmod
- (lambda _
- ;; Make sure 'msgmerge' can modify the PO files.
- (for-each (lambda (po)
- (chmod po #o666))
- (find-files "po" "\\.po$"))))
- (add-after 'unpack 'set-home-directory
- (lambda _ (setenv "HOME" "/tmp"))))))
+ (list
+ #:configure-flags
+ #~(list "--with-systemd=no")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'po-chmod
+ (lambda _
+ ;; Make sure 'msgmerge' can modify the PO files.
+ (for-each (lambda (po)
+ (chmod po #o666))
+ (find-files "po" "\\.po$"))))
+ (add-after 'unpack 'disable-test
+ (lambda _
+ (substitute* "tests/test-portals.c"
+ ;; This test now fails, with gcc-11-13 too.
+ (("g_.*/portal/inhibit/monitor/" all)
+ (string-append "// " all)))))
+ (add-after 'unpack 'set-home-directory
+ (lambda _ (setenv "HOME" "/tmp"))))))
(native-search-paths
(list (search-path-specification
(variable "XDG_DESKTOP_PORTAL_DIR")
