From patchwork Mon Oct 17 04:11:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 43456 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 3E36F27BBEA; Mon, 17 Oct 2022 05:13:19 +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,FREEMAIL_FROM,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 B72D027BBE9 for ; Mon, 17 Oct 2022 05:13:18 +0100 (BST) Received: from localhost ([::1]:51834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okHV7-0004Su-SY for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 00:13:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okHUs-0004Sk-QO for guix-patches@gnu.org; Mon, 17 Oct 2022 00:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okHUs-0005gj-DI for guix-patches@gnu.org; Mon, 17 Oct 2022 00:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okHUs-0000sm-3y for guix-patches@gnu.org; Mon, 17 Oct 2022 00:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58577] [PATCH] gnu: darktable: Update to 4.0.1. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 04:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58577@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16659799493338 (code B ref -1); Mon, 17 Oct 2022 04:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Oct 2022 04:12:29 +0000 Received: from localhost ([127.0.0.1]:46814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okHUK-0000rl-QH for submit@debbugs.gnu.org; Mon, 17 Oct 2022 00:12:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:48022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okHUI-0000rd-Uw for submit@debbugs.gnu.org; Mon, 17 Oct 2022 00:12:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okHUE-0004RI-Nv for guix-patches@gnu.org; Mon, 17 Oct 2022 00:12:23 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:39833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okHUC-0005do-Ct for guix-patches@gnu.org; Mon, 17 Oct 2022 00:12:22 -0400 Date: Mon, 17 Oct 2022 04:11:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1665979928; x=1666239128; bh=rQdHiEwdt6u9EWylIzv8/hEKLWn3O3At7NrpZWDAKG8=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=m07Wnnwpey7zkdjxo95ElkKlPhbhgYBdZOd1SRTK2qwTdVvuuld/A9WxDJJz8OOqG XS/5uaRqSXa60CMgYWn4VZLngK7rYp699lRm6CitPFej3QHO+xl1glSw30H7TJZqA0 D7/I5JyKdwOE5y1X5geNmtDC+1zi660Oz0XI1us00T+EfNh6ZgIP+86gq0FH/2XMnK UTkpf2cDcAZY4Uu+zA4nCXpj2h8nSvbbN660vrhu+7Faq37mRwAo1PyLsrHGZlqAiY jlA9vmTKq3r4zKmy3Za+G8X5qGhxtSNWoqzXZA1C4siK6ajj5MbW/fgpX8e3WyHFsz bwH35ssdGNIHA== Message-ID: <87mt9vqeb9.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hi Guix, Please see the attached patch to update Darktable to the latest version, 4.0.1. I added a phase to patch a file to work around an upstream bug, tracked here: As it is a very minor change I opted for a phase rather than a patch to make this quick and easy, and this should be resolved in the next release. Thanks! John From c362f4cc044a6b6148b35ca33946bca374df9e54 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 17 Oct 2022 00:07:23 -0400 Subject: [PATCH] gnu: darktable: Update to 4.0.1. * gnu/packages/photo.scm (darktable): Update to 4.0.1. [phases]{fix-missing-include}: New phase to work around an upstream bug of a missing include statement. --- gnu/packages/photo.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 378f60793f..e819b5312d 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -460,7 +460,7 @@ (define-public lensfun (define-public darktable (package (name "darktable") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) @@ -468,7 +468,7 @@ (define-public darktable "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl")))) + (base32 "0s0xwp5n4jhzdhbmsg02dlsc503jfznpwqn3rnipg687q3h83vsz")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On" @@ -482,6 +482,13 @@ (define-public darktable (("\"libOpenCL\"") (string-append "\"" (assoc-ref inputs "opencl-icd-loader") "/lib/libOpenCL.so\""))))) + (add-after 'unpack 'fix-missing-include + (lambda _ + ;; Fix missing include needed to build tests. See upstream + ;; issue: https://github.com/darktable-org/darktable/issues/12604 + (substitute* "./src/common/variables.h" + (("once") + "once\n#include \"common/image.h\"")))) (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) ;; Rawspeed fails to build with GCC due to OpenMP error: -- 2.38.0