GNU bug report logs - #65557
[PATCH] gnu: pencil2d: Fix tests.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65557 in the body.
You can then email your comments to 65557 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] gnu: pencil2d: Fix tests.
Date: Sun, 27 Aug 2023 10:54:41 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/animation.scm (pencil2d)[arguments]: Use gexps.
Add fix-tests phase.
---
 gnu/packages/animation.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 9691dd0d80..d6bd3fd03d 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -442,19 +442,24 @@ (define-public pencil2d
     (inputs
      (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (invoke "qmake" (string-append "PREFIX=" out)))))
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (plugin-path (getenv "QT_PLUGIN_PATH")))
-               (wrap-program (string-append out "/bin/pencil2d")
-                 `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))
-               #t))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              ;; Its bundled catch2-2.5.0 fails to build with glibc-2.35.
+              (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
+                         "tests/src/catch.hpp")))
+          (replace 'configure
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (invoke "qmake" (string-append "PREFIX=" out)))))
+          (add-after 'install 'wrap-executable
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (plugin-path (getenv "QT_PLUGIN_PATH")))
+                (wrap-program (string-append out "/bin/pencil2d")
+                  `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))))))))
     (home-page "https://www.pencil2d.org")
     (synopsis "Make 2D hand-drawn animations")
     (description

base-commit: 28fdf6cc16aee56fdc17a31701b90ace6e512481
-- 
2.41.0

Message #10 received at 65557-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: 65557-done <at> debbugs.gnu.org, 65562-done <at> debbugs.gnu.org,
 65561-done <at> debbugs.gnu.org, 65565-done <at> debbugs.gnu.org,
 65564-done <at> debbugs.gnu.org, 65566-done <at> debbugs.gnu.org,
 65593-done <at> debbugs.gnu.org, 65618-done <at> debbugs.gnu.org,
 65619-done <at> debbugs.gnu.org
Subject: Closing
Date: Thu, 31 Aug 2023 18:06:27 +0800

Pushed now, closing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.