From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wJYiGJEc7V7rNQAA0tVLHw (envelope-from ) for ; Fri, 19 Jun 2020 20:14:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oCcBFJEc7V4JHAAAB5/wlQ (envelope-from ) for ; Fri, 19 Jun 2020 20:14:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B590D9400E1 for ; Fri, 19 Jun 2020 20:14:08 +0000 (UTC) Received: from localhost ([::1]:48146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmNOp-0005zV-6F for larch@yhetil.org; Fri, 19 Jun 2020 16:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmNOk-0005yR-Al for guix-patches@gnu.org; Fri, 19 Jun 2020 16:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmNOk-00021O-0j for guix-patches@gnu.org; Fri, 19 Jun 2020 16:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmNOj-0001bU-R3 for guix-patches@gnu.org; Fri, 19 Jun 2020 16:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41953] [PATCH] gnu: darktable: Update to 3.0.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 20:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41953 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41953@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15925976096114 (code B ref -1); Fri, 19 Jun 2020 20:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jun 2020 20:13:29 +0000 Received: from localhost ([127.0.0.1]:56855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNOC-0001aY-Mw for submit@debbugs.gnu.org; Fri, 19 Jun 2020 16:13:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:45520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNOA-0001aQ-9V for submit@debbugs.gnu.org; Fri, 19 Jun 2020 16:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmNO9-0004g0-Rs for guix-patches@gnu.org; Fri, 19 Jun 2020 16:13:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmNO7-0001yW-9Z for guix-patches@gnu.org; Fri, 19 Jun 2020 16:13:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DA6182400FB for ; Fri, 19 Jun 2020 22:13:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1592597599; bh=o0jhXGvv5dM0lElEyBDsj+tJ9qK2MiJGrYytYWb0naA=; h=From:To:Cc:Subject:Date:From; b=Rn+ql41sFWshFJQpMc7XZbHNUKrs5jfyW5+hkmG2OjB9tkXHRnrZ441JnIOW1Y7kU x06uqD3bsxCDm2ot8p+OSfQT6z1Z5uxMJmNKaOKdQ+fM5uaJR+/0Y5blAQx1g3A3Fx SvaSuzXjUgycoFE7czt667ZsXUWyky1HhJOdxZ2qxEKlz2R0Dq0gaJSmnQof7ebF+n 16FBTQGHvoY2U3syMUnIRFAyM8FqpjhAf8oO1T7CuQuE64jGy/ggP7ThQqZE1kNoVe VbpFAay5nOW7aVOaVSErLB6Zitcz51/cdEq2sAvbP0EUQgJYnUTzdOJ61pX4e1346W VtU+y+NBxTgmw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49pVNt1MGYz6tmG; Fri, 19 Jun 2020 22:13:17 +0200 (CEST) From: Vinicius Monego Date: Fri, 19 Jun 2020 17:11:20 -0300 Message-Id: <20200619201120.34116-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/19 16:13:20 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=Rn+ql41s; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.09 X-TUID: PSUyvwu4kau0 * gnu/packages/photo.scm (darktable): Update to 3.0.2. [arguments]: Compile with clang. [arguments]: Wrap GSETTINGS_SCHEMAS_DIR. [license]: Add license information for Rawspeed. [native-inputs]: Add clang. [native-inputs]: Add desktop-file-utils. [native-inputs]: Add glib. [native-inputs]: Add gobject-instrospection. [native-inputs]: Add llvm. [native-inputs]: Add po4a. [native-inputs]: Reorder alphabetically. [inputs]: Add colord-gtk. [inputs]: Add cups. [inputs]: Add graphicsmagick. [inputs]: Add gsettings-desktop-schemas. [inputs]: Add iso-codes. [inputs]: Add libsecret. [inputs]: Add lua. [inputs]: Add openjpeg. [inputs]: Add osm-gps-map. [inputs]: Reorder alphabetically. --- gnu/packages/photo.scm | 80 ++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 23 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4904fa1db1..890035f0c7 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,9 +40,11 @@ #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -52,9 +55,11 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages perl) @@ -457,7 +462,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "2.6.3") + (version "3.0.2") (source (origin (method url-fetch) @@ -465,13 +470,16 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "1w3q3dhcxa0bs590zbsj61ap8z84wmn04xs5q3gjwisqhjf9j655")))) + (base32 "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests #:configure-flags '("-DBINARY_PACKAGE_BUILD=On") #:phases (modify-phases %standard-phases + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" "clang") (setenv "CXX" "clang++"))) (add-before 'configure 'set-LDFLAGS-and-CPATH (lambda* (#:key inputs outputs #:allow-other-keys) (setenv "LDFLAGS" @@ -483,35 +491,60 @@ photographic equipment.") (setenv "CPATH" (string-append (assoc-ref inputs "ilmbase") "/include/OpenEXR:" (or (getenv "CPATH") ""))) - #t))))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/darktable") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas")))) + #t))))) (native-inputs - `(("intltool" ,intltool) + `(("clang" ,clang-9) + ("desktop-file-utils" ,desktop-file-utils) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("llvm" ,llvm) ("perl" ,perl) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("po4a" ,po4a))) (inputs - `(("libxslt" ,libxslt) - ("libxml2" ,libxml2) - ("pugixml" ,pugixml) + `(("cairo" ,cairo) + ("colord-gtk" ,colord-gtk) + ("cups" ,cups) + ("curl" ,curl) + ("dbus-glib" ,dbus-glib) + ("exiv2" ,exiv2) + ("freeimage" ,freeimage) + ("graphicsmagick" ,graphicsmagick) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) - ("sqlite" ,sqlite) + ("ilmbase" ,ilmbase) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("lcms" ,lcms) + ("lensfun" ,lensfun) + ("libgphoto2" ,libgphoto2) ("libjpeg" ,libjpeg-turbo) + ("libomp" ,libomp) ("libpng" ,libpng) - ("cairo" ,cairo) - ("lcms" ,lcms) - ("exiv2" ,exiv2) + ("librsvg" ,librsvg) + ("libsecret" ,libsecret) + ("libsoup" ,libsoup) ("libtiff" ,libtiff) - ("curl" ,curl) - ("libgphoto2" ,libgphoto2) - ("dbus-glib" ,dbus-glib) + ("libwebp" ,libwebp) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("lua" ,lua) ("openexr" ,openexr) - ("ilmbase" ,ilmbase) - ("libsoup" ,libsoup) + ("openjpeg" ,openjpeg) + ("osm-gps-map" ,osm-gps-map) + ("pugixml" ,pugixml) ("python-jsonschema" ,python-jsonschema) - ("libwebp" ,libwebp) - ("lensfun" ,lensfun) - ("librsvg" ,librsvg) - ("json-glib" ,json-glib) - ("freeimage" ,freeimage))) + ("sqlite" ,sqlite))) (home-page "https://www.darktable.org") (synopsis "Virtual lighttable and darkroom for photographers") (description "Darktable is a photography workflow application and RAW @@ -520,7 +553,8 @@ them through a zoomable lighttable and enables you to develop raw images and enhance them.") ;; See src/is_supported_platform.h for supported platforms. (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) - (license license:gpl3+))) + (license (list license:gpl3+ ;; Darktable itself. + license:lgpl2.1+)))) ;; Rawspeed library. (define-public hugin (package -- 2.20.1