From patchwork Thu Dec 23 15:31:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35603 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 0A99A27BBEA; Thu, 23 Dec 2021 15:32:16 +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 CA00327BBE9 for ; Thu, 23 Dec 2021 15:32:15 +0000 (GMT) Received: from localhost ([::1]:54484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Q4l-0000EN-1E for patchwork@mira.cbaines.net; Thu, 23 Dec 2021 10:32:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Q4Z-00009h-NC for guix-patches@gnu.org; Thu, 23 Dec 2021 10:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0Q4Z-0007AK-Do 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-0004WI-Bf for guix-patches@gnu.org; Thu, 23 Dec 2021 10:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52755] [PATCH 4/5] gnu: krita: Add optional dependencies. 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.164027351217322 (code B ref 52755); Thu, 23 Dec 2021 15:32:03 +0000 Received: (at 52755) by debbugs.gnu.org; 23 Dec 2021 15:31:52 +0000 Received: from localhost ([127.0.0.1]:34650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0Q4N-0004VJ-WB for submit@debbugs.gnu.org; Thu, 23 Dec 2021 10:31:52 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0Q4M-0004Uz-5T for 52755@debbugs.gnu.org; Thu, 23 Dec 2021 10:31:50 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 8F1D3240101 for <52755@debbugs.gnu.org>; Thu, 23 Dec 2021 16:31:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640273504; bh=6bTJq6PT9X+08Yk6SmrhTmKKQVME94ob+mc1nIY5UyM=; h=From:To:Cc:Subject:Date:From; b=bf8LMO2Sq2zf7f/tc1yZx0kQo6TQlXluO/fljnONx1RN4Z7IiZbBa0HmUfiyi1teD N8a82oU1VhSr1OF6XuEtxtHaQeos21isx388KfPnuvGn8aVkG40GUUwzOYlVd3+HIJ MycBWjecxhXwEMNt2DUZ6y3T/I9lP0jsPHBWmb/8Dw+WnCAVOuKa/RxxKbQgVIwQo0 eUnywIPl8BODpcD43AdRsUez5/HtL3ihah28W2NzC9QLvJmHn4TVvsV3IcjCzM8dPn DsYb1vrm7BJP3dLN1oCpHGxu7U30cHsb1Auv1XWhab/dyNVTN6KWPDRwT7bal/33/9 Uul154PnxbSNQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JKZ1C4hYqz6tm5; Thu, 23 Dec 2021 16:31:43 +0100 (CET) From: Vinicius Monego Date: Thu, 23 Dec 2021 15:31:15 +0000 Message-Id: <20211223153116.942854-4-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)[arguments]<#:configure-flags>: Don't set -DCMAKE_CXX_FLAGS as it's not required for OpenEXR 3. [inputs]: Remove ilmbase, openexr-2. Add imath, libmypaint, libwebp, openexr. --- gnu/packages/kde.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 60795bc304..5634119369 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gimp) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) #:use-module (gnu packages gps) @@ -485,11 +486,7 @@ expression library, that is used in Krita.") (build-system cmake-build-system) (arguments `(#:tests? #f - #:configure-flags - (list "-DBUILD_TESTING=OFF" - (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "openexr") - "/include/OpenEXR")) + #:configure-flags (list "-DBUILD_TESTING=OFF") #:phases (modify-phases %standard-phases ;; Ensure that icons are found at runtime. @@ -520,7 +517,7 @@ expression library, that is used in Krita.") fftw giflib gsl - ilmbase + imath karchive kcompletion kconfig @@ -538,14 +535,16 @@ expression library, that is used in Krita.") lcms libjpeg-turbo libheif + libmypaint libpng libraw-0.18 libtiff + libwebp libx11 libxcb libxi opencolorio - openexr-2 + openexr openjpeg perl poppler-qt5