From patchwork Thu Dec 23 15:31:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35605 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 6178527BBEA; Thu, 23 Dec 2021 15:32:31 +0000 (GMT) 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 2F4FD27BBE9 for ; Thu, 23 Dec 2021 15:32:31 +0000 (GMT) Received: from localhost ([::1]:55276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Q50-0000m8-CQ for patchwork@mira.cbaines.net; Thu, 23 Dec 2021 10:32:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Q4a-0000A0-3F for guix-patches@gnu.org; Thu, 23 Dec 2021 10:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0Q4Z-0007AS-Q4 for guix-patches@gnu.org; Thu, 23 Dec 2021 10:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0Q4Z-0004WP-OS for guix-patches@gnu.org; Thu, 23 Dec 2021 10:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52755] [PATCH 5/5] gnu: krita: Switch to qt-build-system. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 15:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52755 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52755@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52755-submit@debbugs.gnu.org id=B52755.164027351617341 (code B ref 52755); Thu, 23 Dec 2021 15:32:03 +0000 Received: (at 52755) by debbugs.gnu.org; 23 Dec 2021 15:31:56 +0000 Received: from localhost ([127.0.0.1]:34653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0Q4S-0004Vc-7y for submit@debbugs.gnu.org; Thu, 23 Dec 2021 10:31:56 -0500 Received: from mout02.posteo.de ([185.67.36.66]:51453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0Q4R-0004VB-2D for 52755@debbugs.gnu.org; Thu, 23 Dec 2021 10:31:55 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 779A7240101 for <52755@debbugs.gnu.org>; Thu, 23 Dec 2021 16:31:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640273509; bh=xvWHqQG54ho/ZvNkoXIlkkmiVil6S6pp54+VWigWTzY=; h=From:To:Cc:Subject:Date:From; b=goIxBVzCd5juM5zLmXbG2sDRlpmKD+PYvHp1qOH5xulmhzUnE3krXqJqZjiubVMje 1C/5N4cEG7pS4urK9+/SZvqn1nVG8vV/s0qyILlMZJSvKkrVAmtzXVYWO4JgqETZCq yQuZqwHND6q8ZdbBDtRpsOEjoZ2ji8si6RzIP+oGOC0MMF5KCppCckzJTIrGz75Z0B CJIeX8A2mUGouXnNcts/37BAMFWif6b09oa/sOGLOQRN2csYfjgolhMw/VwHnNaKva efoKH5jLB00Sxe1ZclljoTC7wW+1XX4mYr6eUh8sx67f3pyeDt0bweFQJrC2R2+biH rWcWi71qwHsKw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JKZ1J4l9Vz9rxM; Thu, 23 Dec 2021 16:31:48 +0100 (CET) From: Vinicius Monego Date: Thu, 23 Dec 2021 15:31:16 +0000 Message-Id: <20211223153116.942854-5-monego@posteo.net> In-Reply-To: <20211223153116.942854-1-monego@posteo.net> References: <20211223153116.942854-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde.scm (krita)[build-system]: Switch to qt-build-system. [arguments]<#:phases>: Remove 'wrap-executable phase that is performed by the new build system. --- gnu/packages/kde.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 5634119369..8531e8683e 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -483,25 +483,10 @@ expression library, that is used in Krita.") ".tar.gz")) (sha256 (base32 "0mycxrqp944kp5bhlv8c1x1ikn9av1q7dhzl32jd6gxbphyq7mc4")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:tests? #f - #:configure-flags (list "-DBUILD_TESTING=OFF") - #:phases - (modify-phases %standard-phases - ;; Ensure that icons are found at runtime. - ;; This works around . - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (qt '("qtbase" "qtsvg"))) - (wrap-program (string-append out "/bin/krita") - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins/")) - qt))) - #t)))))) + #:configure-flags (list "-DBUILD_TESTING=OFF"))) (native-inputs (list curl eigen