From patchwork Thu Oct 13 05:41:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43364 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 8025B27BBE9; Thu, 13 Oct 2022 06:45:18 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 C8D6227BBEA for ; Thu, 13 Oct 2022 06:45:17 +0100 (BST) Received: from localhost ([::1]:49056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir1x-0000a5-0M for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:45:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqyo-0007eZ-ST for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqyo-0004h2-KH for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqyo-00087l-Fw for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 6/9] gnu: Add qtimageformats, version 6.3.1. References: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> In-Reply-To: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> Resent-From: Cairn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 05:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58481 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "58481@debbugs.gnu.org" <58481@debbugs.gnu.org> Received: via spool by 58481-submit@debbugs.gnu.org id=B58481.166563969331191 (code B ref 58481); Thu, 13 Oct 2022 05:42:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:41:33 +0000 Received: from localhost ([127.0.0.1]:59002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqyL-000871-0A for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:41:33 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:52207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqyJ-00086o-As for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:41:32 -0400 Date: Thu, 13 Oct 2022 05:41:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639685; x=1665898885; bh=YrrXaLaOEIAxGUDYFNnX+ZvUrLvs1uwz6COJj9xO0pU=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=r7yUKFULVjjWAnifbXuXgEbFg5gpNR09mNIgVxJi52lKl3bhK96z2twycuHL4l8Lb Q8MKt6YGdtGLHNnKWXib/DfqpCqv6bQWoHr4rIjQCWqepROCZhIFtnG7C39GFPkpgb 7zanXoYX3t4RrfaSZBX9xRvQ4INX/Xf/ElmtkQAwVuVSo2KzYLzScHZVnGYsYVMJZC Kw1U1QIKJ07UTr8gHct3M3uv9/zszTI69yq+Mi5FGsHY4LYueMcosWXGJoJhBnAkGn diEsCmwIUwTBqMPs1+Q61ko/csvFXjmMkEtTPQByj+GuKksZv6ojV5kot339bnmEig MnuFZvXxJOcIw== Message-ID: Feedback-ID: 6989168:user:proton 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Cairn X-ACL-Warn: , Cairn via Guix-patches X-Patchwork-Original-From: Cairn via Guix-patches via From: Cairn X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtimageformats): New variable. --- gnu/packages/qt.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (name "qtx11extras") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 85f9c0716c..2d9923b19f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -986,6 +986,47 @@ (define-public qtimageformats-5 (description "The QtImageFormats module contains plugins for adding support for MNG, TGA, TIFF and WBMP image formats."))) +(define-public qtimageformats + (package (inherit qtsvg) + (name "qtimageformats") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0br1vqgx0hcc2nx32xviic94mvj6fbagrnzskdr7zdmvvyw140xd")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/3rdparty") + #t)))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* + "src/plugins/imageformats/jp2/qjp2handler.cpp" + (("^#include ") + "#include \n#include ")))) + (add-before 'check 'set-offscreen-display + (lambda _ + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" "/tmp")))))) + (inputs + (list jasper + libmng + libtiff + libwebp + mesa + qtbase + zlib)) + (synopsis "Additional Image Format plugins for Qt") + (description "The QtImageFormats module contains plugins for adding +support for MNG, TGA, TIFF and WBMP image formats."))) + (define-public qtx11extras (package (inherit qtsvg-5)