From patchwork Mon Nov 29 00:04:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 34870 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 0E16527BBE9; Mon, 29 Nov 2021 00:05: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=-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 91E5D27BBEA for ; Mon, 29 Nov 2021 00:05:30 +0000 (GMT) Received: from localhost ([::1]:48386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrUAj-0005FM-Pc for patchwork@mira.cbaines.net; Sun, 28 Nov 2021 19:05:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0005Ei-Ev for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0001JI-6N for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrUAH-0000Mu-Jr for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52171] [PATCH core-updates-frozen v2 1/2] gnu: darktable: Build with libsoup 2. References: <20211128234857.321602-1-monego@posteo.net> In-Reply-To: <20211128234857.321602-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Nov 2021 00:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52171 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52171@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52171-submit@debbugs.gnu.org id=B52171.16381442891380 (code B ref 52171); Mon, 29 Nov 2021 00:05:01 +0000 Received: (at 52171) by debbugs.gnu.org; 29 Nov 2021 00:04:49 +0000 Received: from localhost ([127.0.0.1]:36547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA4-0000MC-PY for submit@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:48 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA1-0000Lv-3J for 52171@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A6B56240101 for <52171@debbugs.gnu.org>; Mon, 29 Nov 2021 01:04:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638144278; bh=2d+tKDSoB/VTKfDlrf8OCNv2RDj2uyOS8M3R64eHE70=; h=From:To:Cc:Subject:Date:From; b=DHQgEy7sT03dy7yZLq1B7be/kC/YUC0+TbESNUNb+R0K4ZhpMiIZtph7NIBRL3obF AYZRCXve0nkjsCIxbcO7Qidxu7YQ41+t21hNiFUlWNUPw45CaMgIcaYQf+YyuoLdB1 KDRz/yB01KY6I8NRNRgMPPT8GsbycowVUZb4Xim3pw6JlChvW2lVvJ29VNXISX1M4w d55iWVbFl6tivxANnJ2GKwi5Ld9TzYafv0e6QT1yqePKdzoBoFck2RFk2boOSgnLuz 7v/icoXmqoDw7TpUsUluAZMtOIleXPX8Mga9d7E0u/hHgxODUBHbWAuCgVyxksVRQC Noc/SXhtLFXbg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J2QZY3mfDz9rxK; Mon, 29 Nov 2021 01:04:36 +0100 (CET) From: Vinicius Monego Date: Mon, 29 Nov 2021 00:04:20 +0000 Message-Id: <20211129000421.324049-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/photo.scm (darktable)[inputs]: Change libsoup to libsoup-minimal-2. --- gnu/packages/photo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: e765ad091d861c99eae9fdd402214a2e2e90ed4d diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index da15126af4..8a07f32f3c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -562,7 +562,7 @@ photographic equipment.") ("libpng" ,libpng) ("librsvg" ,librsvg) ("libsecret" ,libsecret) ;optional, for storing passwords - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ("libtiff" ,libtiff) ("libwebp" ,libwebp) ;optional, for WebP support ("libxml2" ,libxml2) From patchwork Mon Nov 29 00:04:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 34869 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 CF5ED27BBEB; Mon, 29 Nov 2021 00:05:30 +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=-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 6286027BBE9 for ; Mon, 29 Nov 2021 00:05:30 +0000 (GMT) Received: from localhost ([::1]:48364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrUAj-0005F1-H1 for patchwork@mira.cbaines.net; Sun, 28 Nov 2021 19:05:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0005Eh-E9 for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0001JO-5K for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrUAI-0000N1-0o for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52171] [PATCH core-updates-frozen v2 2/2] gnu: darktable: Build with OpenEXR 3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Nov 2021 00:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52171 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52171@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52171-submit@debbugs.gnu.org id=B52171.16381442931396 (code B ref 52171); Mon, 29 Nov 2021 00:05:01 +0000 Received: (at 52171) by debbugs.gnu.org; 29 Nov 2021 00:04:53 +0000 Received: from localhost ([127.0.0.1]:36551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA9-0000MS-01 for submit@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:53 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA5-0000M1-9M for 52171@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A8034240101 for <52171@debbugs.gnu.org>; Mon, 29 Nov 2021 01:04:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638144283; bh=ZzZ0qB9GnLQFHCec+n6I2nm8SYvb2c5vDAIIc/pSpRQ=; h=From:To:Cc:Subject:Date:From; b=DjayBaqU5Tog0vVo4MdJBghIycfanEa+O07AHBqrJ+dHfv1Gcp8UUdOvOV+hY7QMB E6NiYhGNSyONLVmUHEkD8SPd6JErsFlzQsd8pUSNwwcGR3XikCt6H234eLBWNYgKR7 r8/XaFftSIdiwP7AS4B8Qq+P52XMkH3MM5aXX6JdAgXdKfIIwLOZ4N6y4JSdF38g9U p+gDqvX10rVpx4ZOvVBNSK6ZfAaCZhjZy7VKQjuzoj+pWC1+oA9RUDgcxzbT8FkdRH 5zOK++X61TJ+yZIZCLQ3+UdcYrqBB13j0WNc3dQbPqhZb0qlqBEkz3/mJZorXMzcA8 JPhQBzG7hgS7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J2QZf5tGRz6tmN; Mon, 29 Nov 2021 01:04:42 +0100 (CET) From: Vinicius Monego Date: Mon, 29 Nov 2021 00:04:21 +0000 Message-Id: <20211129000421.324049-2-monego@posteo.net> In-Reply-To: <20211129000421.324049-1-monego@posteo.net> References: <20211129000421.324049-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/photo.scm (darktable)[arguments]<#:phases>: Rename 'set-LDFLAGS-and-CPATH to 'set-LDFLAGS. Don't set CPATH. [inputs]: Remove ilmbase. Add imath. Replace openxr-2 with openexr. --- Removed now unused 'inputs' from the lambda. It would be good if someone could test the OpenEXR export because the button doesn't fit in my screen for me to try. gnu/packages/photo.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8a07f32f3c..34d9cc3dd0 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -504,18 +504,12 @@ photographic equipment.") (substitute* "CMakeLists.txt" (("\\$\\{LLVM_INSTALL_PREFIX\\}") (assoc-ref %build-inputs "clang"))))) - (add-before 'configure 'set-LDFLAGS-and-CPATH - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - (assoc-ref outputs "out") "/lib/darktable")) - - ;; Ensure the OpenEXR headers are found. - (setenv "CPATH" - (string-append - (search-input-directory inputs "include/OpenEXR") - ":" (or (getenv "CPATH") ""))))) + (assoc-ref outputs "out") "/lib/darktable")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -550,7 +544,7 @@ photographic equipment.") ("graphicsmagick" ,graphicsmagick) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) - ("ilmbase" ,ilmbase) + ("imath" ,imath) ("iso-codes" ,iso-codes) ;optional, for language names in the preferences ("json-glib" ,json-glib) ("lcms" ,lcms) @@ -569,7 +563,7 @@ photographic equipment.") ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support - ("openexr" ,openexr-2) ;optional, for EXR import/export + ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view ("pugixml" ,pugixml)