guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates-frozen updated: gnu: gtk+: Fix testsuite failure on


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: gtk+: Fix testsuite failure on non-x86_64 platforms.
Date: Sun, 19 Sep 2021 14:17:41 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new b452fe8  gnu: gtk+: Fix testsuite failure on non-x86_64 platforms.
b452fe8 is described below

commit b452fe87e0c6e7634a2cb44274fa46832c763b40
Author: Thiago Jung Bauermann <bauermann@kolabnow.com>
AuthorDate: Tue Sep 14 20:24:37 2021 -0300

    gnu: gtk+: Fix testsuite failure on non-x86_64 platforms.
    
    On non-x86_64 platforms, gtk+ is linked with a gdk-pixbuf version that
    doesn’t support SVG.  This causes the ‘icontheme’ test to fail because it
    tries to fetch SVG icons in some of the tests.
    
    Therefore, we need to disable the test when SVG support isn’t available.
    
    * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Use the ‘target-x86-64?’
    convenience function.
    [arguments]<#:phases>{disable-failing-tests}: Disable ‘icontheme’ test on
    non-x86_64 platforms.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/packages/gtk.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 24c24d5..8760712 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -958,8 +958,7 @@ application suites.")
        ("freetype" ,freetype)
        ;; SVG support is optional and requires librsvg, which pulls in rust.
        ;; Rust is not supported well on every architecture yet.
-       ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system)
-                                                       (%current-system)))
+       ("gdk-pixbuf" ,(if (target-x86-64?)
                           gdk-pixbuf+svg
                           gdk-pixbuf))
        ("glib" ,glib)
@@ -1028,7 +1027,12 @@ application suites.")
                (("notify no-gtk-init object objects-finalize papersize rbtree")
                 "no-gtk-init papersize rbtree")
                (("stylecontext templates textbuffer textiter treemodel 
treepath")
-                "stylecontext textbuffer textiter treemodel treepath"))
+                "stylecontext textbuffer textiter treemodel treepath")
+               ;; The ‘icontheme’ test needs SVG support.
+               ,@(if (not (target-x86-64?))
+                     '((("floating focus gestures grid gtkmenu icontheme 
keyhash listbox")
+                        "floating focus gestures grid gtkmenu keyhash 
listbox"))
+                     '()))
              (substitute* "testsuite/a11y/Makefile.in"
                (("accessibility-dump tree-performance text children derive")
                 "tree-performance text children derive"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]