From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: [PATCH 1/2] gnu: shotwell: Update to 0.23.5. Date: Thu, 18 Aug 2016 14:35:41 +0200 Message-ID: <1471523742-22088-1-git-send-email-me@tobias.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baMYD-0006av-12 for guix-devel@gnu.org; Thu, 18 Aug 2016 08:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baMY7-0003JF-Hs for guix-devel@gnu.org; Thu, 18 Aug 2016 08:35:59 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:36068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baMY7-0003J7-BF for guix-devel@gnu.org; Thu, 18 Aug 2016 08:35:55 -0400 Received: from mfilter36-d.gandi.net (mfilter36-d.gandi.net [217.70.178.167]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 593B41720E7 for ; Thu, 18 Aug 2016 14:35:53 +0200 (CEST) Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter36-d.gandi.net (mfilter36-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id qQzGuMMnZDXP for ; Thu, 18 Aug 2016 14:35:51 +0200 (CEST) Received: from v5.lan (unknown [109.134.239.169]) (Authenticated sender: me@tobias.gr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8CC961720A4 for ; Thu, 18 Aug 2016 14:35:51 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/gnome.scm (shotwell): Update to 0.23.5. [propagated-inputs]: Add dconf. [native-inputs]: Remove m4, desktop-file-utils, which, gnome-doc-utils, python2 and python2-libxml2. Add itstool. [inputs]: Remove gst-plugins-good, rest and gtk+. Add glib:bin. --- The *inputs changed significantly due to a reported change in build system, so I just started more or less with nothing and kept what's needed to build. Inputs now don't include things like gtk+, though, which might be a mistake. Other removed inputs like rest and gst-plugins-good were obsolete or unreferenced, respectively. gnu/packages/gnome.scm | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e133fcc..66b461c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 ng0 +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +86,6 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages lirc) #:use-module (gnu packages lua) - #:use-module (gnu packages m4) #:use-module (gnu packages image) #:use-module (gnu packages networking) #:use-module (gnu packages password-utils) @@ -3841,7 +3841,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.23.1") + (version "0.23.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3849,39 +3849,27 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "12imip32mav0zqg1fh4xm6zk4qsgg2435xsyb6ljz47i37zk6kg2")))) + "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07")))) (build-system glib-or-gtk-build-system) - (arguments - `(#:tests? #f ;no "check" target - #:make-flags '("CC=gcc") - #:configure-flags '("--disable-gsettings-convert-install") - #:out-of-source? #f)) + (propagated-inputs + `(("dconf" ,dconf))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) - ("m4" ,m4) - ("desktop-file-utils" ,desktop-file-utils) - ("vala" ,vala) - ("which" ,which) - ("gnome-doc-utils" ,gnome-doc-utils) - ;; FIXME: I only added python2-libxml2 because xml2po needs it at - ;; runtime. It should be propagated. - ("python2-libxml2" ,python2-libxml2) - ("python2" ,python-2))) + ("itstool" ,itstool) + ("vala" ,vala))) (inputs - `(("gstreamer" ,gstreamer) + `(("glib:bin" ,glib "bin") + ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) ("libgee" ,libgee) ("gexiv2" ,gexiv2) ("libraw" ,libraw) ("json-glib" ,json-glib) - ("rest" ,rest) ("webkitgtk" ,webkitgtk) ("sqlite" ,sqlite) ("libsoup" ,libsoup) ("libxml2" ,libxml2) - ("gtk+" ,gtk+) ("libgudev" ,libgudev) ("libgphoto2" ,libgphoto2))) (home-page "https://wiki.gnome.org/Apps/Shotwell") -- 2.7.4