guix-commits
[Top][All Lists]
Advanced

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

01/15: gnu: gdk-pixbuf: Add a debug output.


From: guix-commits
Subject: 01/15: gnu: gdk-pixbuf: Add a debug output.
Date: Fri, 12 Mar 2021 09:07:15 -0500 (EST)

apteryx pushed a commit to branch staging
in repository guix.

commit d2a97aa421e5501f3633bae490e4244680678612
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Mar 11 06:55:07 2021 -0500

    gnu: gdk-pixbuf: Add a debug output.
    
    * gnu/packages/gtk.scm (gdk-pixbuf)[outputs]{debug}: New output.
    [arguments]{modules}: New argument.
    [phases]{shrink-runpath}: New phase.
---
 gnu/packages/gtk.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c58226c..096424e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -565,12 +565,15 @@ highlighting and other features typical of a source code 
editor.")
              (base32
               "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))
    (build-system meson-build-system)
+   (outputs '("out" "debug"))
    (arguments
     `(#:configure-flags '("-Dinstalled_tests=false")
+      #:modules ((guix build meson-build-system)
+                 (guix build utils)
+                 (srfi srfi-1))
       #:phases
       (modify-phases %standard-phases
-        (add-after
-         'unpack 'disable-failing-tests
+        (add-after 'unpack 'disable-failing-tests
          (lambda _
            (substitute* "tests/meson.build"
              ;; XXX FIXME: This test fails on armhf machines with:
@@ -581,8 +584,13 @@ highlighting and other features typical of a source code 
editor.")
              ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
              ;; assertion failed (error == NULL): Data differ
              ;; (gdk-pixbuf-error-quark, 0)
-             ((".*'pixbuf-jpeg'.*") ""))
-           #t))
+             ((".*'pixbuf-jpeg'.*") ""))))
+        (replace 'shrink-runpath
+          ;; Workaround until core-updates is merged (this is fixed in commit
+          ;; ca080b3efb).
+          (lambda* (#:key outputs #:allow-other-keys #:rest args)
+            (apply (assoc-ref %standard-phases 'shrink-runpath)
+                   `(,@args #:outputs ,(alist-delete "debug" outputs)))))
         ;; The slow tests take longer than the specified timeout.
         ,@(if (any (cute string=? <> (%current-system))
                    '("armhf-linux" "aarch64-linux"))



reply via email to

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