From patchwork Sun Jul 23 08:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 52003 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 2251427BBEA; Sun, 23 Jul 2023 10:26:05 +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.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 369A227BBE2 for ; Sun, 23 Jul 2023 10:26:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNVKv-0000qO-Lw; Sun, 23 Jul 2023 05:25:09 -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 1qNVKp-0000p7-8F for guix-patches@gnu.org; Sun, 23 Jul 2023 05:25:03 -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 1qNVKp-0000zG-0L for guix-patches@gnu.org; Sun, 23 Jul 2023 05:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNVKo-0007cK-SP for guix-patches@gnu.org; Sun, 23 Jul 2023 05:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 066/209] gnu: kimageformats: use G-expressions. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169010425129142 (code B ref 64798); Sun, 23 Jul 2023 09:25:02 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 09:24:11 +0000 Received: from localhost ([127.0.0.1]:38259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNVJz-0007Zs-1k for submit@debbugs.gnu.org; Sun, 23 Jul 2023 05:24:11 -0400 Received: from out162-62-57-252.mail.qq.com ([162.62.57.252]:53735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNVJu-0007YQ-6q for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 05:24:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690104238; bh=xv3L695xLTsGXqFRtkr/64PlKhcyBsqfkVg6nY6+6n8=; h=From:To:Subject:Date:In-Reply-To:References; b=uO/h325lrWo4RmsfoMgyDuNZfVaklv08f0Vq5DLHXzqqhSZI3rqkEGM53w6OSlY8O ZdZ6s1Os/Nfbz+/23KF8I8E9E5hYAn8uknGPJMT9QDaYEGy9XZ6u7MNh2sJADIEQDW Awy9kesut6509k+XbitWpWygZ12oa0s8qXvI5T08= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 5F59DA7D; Sun, 23 Jul 2023 17:23:53 +0800 X-QQ-mid: xmsmtpt1690104237t9vl5hzwr Message-ID: X-QQ-XMAILINFO: NXsiBHiOlZoN8+MBuI/QZyUs3W8ux6o7QaXB07OjYuewm8JDbvvNp/QDvco2sb /XPY7Q0eYTOszzfEY9fNzRpldbrqwhlaUkqDtBTPJWWfb320IKK0TeoEMUzQrmiUbVw8iyVt21p+ QvhUPtlg9GAEnK+16OUV2XoBuDk2O130JPihTuUrnbyitO8cwRZoGbNixWsnro066+aW/BLmfIpV tuwt78BK6NMHGWLdykNA4fwDFDTHj5QaJu59fLHAwbLRPNAsZTZwYRXqBj8g4yRu12g6RRCNHuG/ yvTscUwlNeBUeJUy5OH4tgfxkfzgDST521XV1DlDdJG9f3c5DWendoFwMNjyfB8cAJM/m1ubEbWz z/f191wbwcNYeMr1Lytp9Dc7bD95FVmnNln2uByXwknJOz146nWqpuvtu51JJkAVcbUypaxj2Qx1 aO2069bPxcid5JARixyuRufb90NdRl/KpcOEggFJj7ci8JpMqB+nI1HVVUN0l4IrBBIuMdkAWXbB 14IiiHnh1oudwzXnOY3mXRJSzMJeRX0e8oOfW1MuTd5dIlF0eop9ZP4KU2Bvc/eNJMrWRjlYRdu+ vuk7Zp7cgdDR9M3B1JWVhep/4itpCHqQohlhMfbFkX73uDsbREh4TbvJadTzNlRIDrR/zmJbhUVS EV0R/LxPdbkrbDV0/Lcx/prG4nDu65vZTCj0F4B4XYkkueGpbSu9ZzEV+P+TKomU1iAhdUK7/yOq 7I7GClI9KtxlC2lEi8kX6JVNxkmy9vawOG+dahDwbSHcRzxR3N61NyZ5hNGAd/m4wqgQ9lnAhxhG q3w9r5gxYF6LLXet0nAq9CLFQ3YjyB/SNWsZpu5ReZofs+HIQvXgJu8bVlMow7K+GJdHXKOlBMsX x1j/VglaNjEM08a6IGLSVNXkqirHcNptj2WST2w/QMnktUBTEAD0IfGDyKaTUp9S3qlBzIVlmhr/ gRvg8MBQwGn5dzFLuFM6oeiGbKtX9duhjH5BrT+XWxy1/QfhwkSGpnHPt+lCGu6/XI9da4twqORe SS1AbiKQ== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= Date: Sun, 23 Jul 2023 16:44:46 +0800 X-OQ-MSGID: <5e27ce493825bd39568a2f77d167985653af146f.1690099026.git.873216071@qq.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> 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 * gnu/packages/kde-frameworks.scm (kimageformats)[arguments]: Rewrite as G-expressions. --- gnu/packages/kde-frameworks.scm | 48 +++++++++++++++++---------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c28cf94b82..1dd1319c6f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1811,29 +1811,31 @@ (define-public kimageformats openexr-2 ; for OpenEXR high dynamic-range images qtbase-5)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "QT_PLUGIN_PATH" - (string-append (getcwd) "/bin:" - (getenv "QT_PLUGIN_PATH"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - ;; FIXME: I guess kde's qt no this fail. - ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283 - (invoke "ctest" "-E" "kimageformats-read-psd"))))) - ;; FIXME: The header files of ilmbase (propagated by openexr) are not - ;; found when included by the header files of openexr, and an explicit - ;; flag needs to be set. - #:configure-flags - (list (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "ilmbase") - "/include/OpenEXR")))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QT_PLUGIN_PATH" + (string-append (getcwd) "/bin:" + (getenv "QT_PLUGIN_PATH"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + ;; FIXME: I guess kde's qt no this fail. + ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283 + (invoke "ctest" "-E" "kimageformats-read-psd"))))) + ;; FIXME: The header files of ilmbase (propagated by openexr) are not + ;; found when included by the header files of openexr, and an explicit + ;; flag needs to be set. + #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs + "ilmbase") + "/include/OpenEXR")))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats") (description "This framework provides additional image format plugins for