From patchwork Sun Aug 27 02:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53240 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 809E827BBEA; Sun, 27 Aug 2023 03:55:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9987C27BBE2 for ; Sun, 27 Aug 2023 03:55:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qa5vW-0002bv-Tg; Sat, 26 Aug 2023 22:54:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qa5vV-0002bm-Hd for guix-patches@gnu.org; Sat, 26 Aug 2023 22:54:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qa5vV-0001i3-A1 for guix-patches@gnu.org; Sat, 26 Aug 2023 22:54:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qa5va-0008Va-Ap for guix-patches@gnu.org; Sat, 26 Aug 2023 22:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65557] [PATCH] gnu: pencil2d: Fix tests. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 02:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65557 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65557@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169310489032680 (code B ref -1); Sun, 27 Aug 2023 02:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Aug 2023 02:54:50 +0000 Received: from localhost ([127.0.0.1]:43718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qa5vN-0008V2-UE for submit@debbugs.gnu.org; Sat, 26 Aug 2023 22:54:50 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qa5vJ-0008Uj-VE for submit@debbugs.gnu.org; Sat, 26 Aug 2023 22:54:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qa5v8-0002ZR-7F for guix-patches@gnu.org; Sat, 26 Aug 2023 22:54:34 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qa5v5-0001hQ-3v for guix-patches@gnu.org; Sat, 26 Aug 2023 22:54:33 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id E198C38A0135; Sun, 27 Aug 2023 02:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693104868; bh=DvDyM2fgfH8qPhfBH+9LpEHDjaydsv9adShz3uBl98A=; h=From:To:Cc:Subject:Date:From; b=rP9xTgD3Or33YX1va2st/HUu8urimwLD4MN/LYiH8qSosJ5hJ9wumZBAK9mFAEf3v ZD9Lt2fkjypnQoiFY4k0+ylewu7ageJXlDaoNrVIkXWKmnDF5wSvsnhBaBzFQyRT8C gRXBTPIXPsV/qMk+SeHgXfWhmoQI64UuF1NgulfMVvIZPLP9ZSMiG45bSi9E2RjTf7 4OXAxbkbwNl3xsFkTpMVc326A98IsdrxYKjSANLhIra1cyoWaRHvaUp9fsMVt5jt3b lrdTYjhwTI2i9Con1+0uq2xUDwWa2fZn8uVaQRbXavfW4ujDrUQ80AWiTq0vweHaLf 1HNXRlCRZQ3tDbQBhpUZ13KaK8DQN9F72nZZAXjPSG18BqDRSTiCQpp4/EeZ/AG6MQ YgSIBV4FIuoagFPotsJG1v6vmMHmGWTlKsgGRR9ZkbIKx8bJcOF/eqLNU+BfJqcVAi cADRsQZ50oN9TGVSI4ZYn3iJHfxQIbJnr06Ne28G5G7BM6qPuG+u0QrG5U5oJ7/4wd F6JjTdG2BH/ymwTeC25fOqVggvDkVXU+b0d/SlNtQKI6Kth4y6zpKWUB0KqYqFdIqd nwH1ljV4hFchfH5oLpTcHOwmIZV7OYUrgixoDXOXSziRKlytJEHq70TC7pPw4lvsLE LKfee4xmUahg4jtR2Lh1R3vc= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id c3Czq4qtdAn3; Sun, 27 Aug 2023 02:54:24 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 27 Aug 2023 02:54:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 157908bd; Sun, 27 Aug 2023 02:54:45 +0000 (UTC) Date: Sun, 27 Aug 2023 10:54:41 +0800 Message-ID: <499c3851ede4c6e239dbd2332006a3e761e29222.1693104877.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/animation.scm (pencil2d)[arguments]: Use gexps. Add fix-tests phase. --- gnu/packages/animation.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) base-commit: 28fdf6cc16aee56fdc17a31701b90ace6e512481 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