[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/11: gnu: gtk+-2: Remove trailing #t and use gexps.
From: |
guix-commits |
Subject: |
09/11: gnu: gtk+-2: Remove trailing #t and use gexps. |
Date: |
Sun, 20 Nov 2022 14:10:14 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 051a6068b603e809ef65b86d7f993e7a302733bb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Nov 18 20:09:58 2022 -0500
gnu: gtk+-2: Remove trailing #t and use gexps.
* gnu/packages/gtk.scm (gtk+-2) [phases]: Remove trailing #t.
[arguments]: Use gexps.
---
gnu/packages/gtk.scm | 78 +++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1f511a77d2..64c09aea4b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -906,47 +906,43 @@ is part of the GNOME accessibility project.")
python-wrapper
xorg-server-for-tests))
(arguments
- `(#:parallel-tests? #f
- #:configure-flags
- (list "--with-xinput=yes"
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- (substitute* "gtk/Makefile.in"
- (("aliasfilescheck\\.sh") ""))
- (substitute* "gtk/tests/recentmanager.c"
- (("g_test_add_func \\(\"/recent-manager.*;") ""))
- (substitute* "gtk/tests/defaultvalue.c"
- (("return g_test_run\\(\\);") ""))
- ;; These require XPM support in Gdk-Pixbuf which is obsolete.
- (substitute* "gtk/tests/textbuffer.c"
- (("g_test_add_func.*test_fill_empty\\);")
- "")
- (("g_test_add_func.*test_tag\\);")
- ""))
- #t))
- (add-before 'check 'pre-check
- (lambda _
- ;; Tests require a running X server.
- (system "Xvfb :1 +extension GLX &")
- (setenv "DISPLAY" ":1")
- ;; Tests write to $HOME.
- (setenv "HOME" (getcwd))
- ;; Tests look for $XDG_RUNTIME_DIR.
- (setenv "XDG_RUNTIME_DIR" (getcwd))
- ;; For missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))
- (add-after 'install 'remove-cache
- (lambda* (#:key outputs #:allow-other-keys)
- (for-each
- delete-file
- (find-files (assoc-ref outputs "out") "immodules.cache"))
- #t)))))
+ (list
+ #:parallel-tests? #f
+ #:configure-flags
+ #~(list "--with-xinput=yes"
+ (string-append "--with-html-dir=" #$output
+ "/share/gtk-doc/html"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "gtk/Makefile.in"
+ (("aliasfilescheck\\.sh") ""))
+ (substitute* "gtk/tests/recentmanager.c"
+ (("g_test_add_func \\(\"/recent-manager.*;") ""))
+ (substitute* "gtk/tests/defaultvalue.c"
+ (("return g_test_run\\(\\);") ""))
+ ;; These require XPM support in Gdk-Pixbuf which is obsolete.
+ (substitute* "gtk/tests/textbuffer.c"
+ (("g_test_add_func.*test_fill_empty\\);")
+ "")
+ (("g_test_add_func.*test_tag\\);")
+ ""))))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 +extension GLX &")
+ (setenv "DISPLAY" ":1")
+ ;; Tests write to $HOME.
+ (setenv "HOME" (getcwd))
+ ;; Tests look for $XDG_RUNTIME_DIR.
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")))
+ (add-after 'install 'remove-cache
+ (lambda _
+ (for-each delete-file
+ (find-files #$output "immodules.cache")))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK2_PATH")
- branch core-updates updated (8da7e38773 -> affaacf4f4), guix-commits, 2022/11/20
- 01/11: gnu: pango: Update to 1.50.10 and remove input labels., guix-commits, 2022/11/20
- 04/11: gnu: harfbuzz: Update to 5.3.1., guix-commits, 2022/11/20
- 06/11: gnu: graphviz: Update to 7.0.1 and remove input labels., guix-commits, 2022/11/20
- 07/11: gnu: wayland-protocols: Update to 1.29., guix-commits, 2022/11/20
- 09/11: gnu: gtk+-2: Remove trailing #t and use gexps.,
guix-commits <=
- 10/11: gnu: gtk+-2: Use librsvg-for-system., guix-commits, 2022/11/20
- 03/11: gnu: libdrm: Update to 2.4.114., guix-commits, 2022/11/20
- 05/11: gnu: mesa: Update to 22.2.4., guix-commits, 2022/11/20
- 02/11: gnu: mesa-headers: Strip trailing #t., guix-commits, 2022/11/20
- 11/11: gnu: gtk+: Use gexps and replace iso-codes/official with iso-codes., guix-commits, 2022/11/20
- 08/11: gnu: pangomm: Update to 2.50.1 and remove input labels., guix-commits, 2022/11/20