From patchwork Mon Apr 15 12:47:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63017 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 6858F27BBEB; Mon, 15 Apr 2024 13:53:13 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 8552E27BBE9 for ; Mon, 15 Apr 2024 13:53:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLpW-0005de-Qj; Mon, 15 Apr 2024 08:53:02 -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 1rwLo7-0004FL-JT for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:37 -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 1rwLo0-00031o-Uf for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLoC-0003iN-Ga for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:40 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 59/63] gnu: Add kimageformats-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:51:40 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70395@debbugs.gnu.org Received: via spool by 70395-submit@debbugs.gnu.org id=B70395.171318549814249 (code B ref 70395); Mon, 15 Apr 2024 12:51:40 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:51:38 +0000 Received: from localhost ([127.0.0.1]:37253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLo8-0003hR-Vk for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:51:38 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:41906 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLlb-00038L-3s for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:49:09 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowADHzgIjIh1mg5GuAw--.11091S10; Mon, 15 Apr 2024 20:48:38 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:47:36 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowADHzgIjIh1mg5GuAw--.11091S10 X-Coremail-Antispam: 1UD129KBjvJXoWxJFWxAFy8tw4fXr45Zw4fZrb_yoW5urWfp3 ZYkrnI9ry5KF4rA3WxXw4xuwnxZwnYqFWDuw43X347Kr13JrWkuryxCrZ8CF47WF10y3Wj ka1Fyr4UWr45JrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9mb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07bO6pPUUUUU= X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , 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-6): New variable. (kimageformats): Inherit above. Change-Id: I1766a88c87b1a5c1ce5656d10d2044d090d9586c --- gnu/packages/kde-frameworks.scm | 61 ++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c50404c991..b49a23f022 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2689,8 +2689,53 @@ (define-public kimageannotator (description "This library provides tools to annotate images.") (license license:lgpl3+))) +(define-public kimageformats-6 + (package + (name "kimageformats") + (version "6.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0pn9zjx18jmbdbpdskchwy0vi9clra4jls6d3dz6bjdli82zlcxh")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list karchive-6 ; for Krita and OpenRaster images + openexr ; for OpenEXR high dynamic-range images + qtbase + libjxl + libraw + libavif + ;; see https://bugs.kde.org/show_bug.cgi?id=468288, + ;; kimageformats-read-psd test need QTiffPlugin + qtimageformats + ;; FIXME: make openexr propagate two package + imath zlib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (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 +QtGui. As such it is not required for the compilation of any other software, +but may be a runtime requirement for Qt-based software to support certain image +formats.") + (license license:lgpl2.1+))) + (define-public kimageformats (package + (inherit kimageformats-6) (name "kimageformats") (version "5.114.0") (source (origin @@ -2708,7 +2753,8 @@ (define-public kimageformats (inputs (list karchive ; for Krita and OpenRaster images openexr-2 ; for OpenEXR high dynamic-range images - qtbase-5)) + qtbase-5 + qtimageformats-5)) (arguments (list #:phases @@ -2716,18 +2762,7 @@ (define-public kimageformats (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"))))) + (setenv "QT_QPA_PLATFORM" "offscreen")))) ;; 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.