From 735b8db6caac0adabfd6a5700b6ac6b9e23f2c1b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 18 Aug 2016 01:04:42 +0200
Subject: gnu: shotwell: Update to 0.23.5.

* 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.
[inputs]: Remove gst-plugins-good, rest, and gtk+. Add glib:bin.
---
 gnu/packages/gnome.scm | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 05212b2321..f12b9774a3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -86,7 +87,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)
@@ -3842,7 +3842,7 @@ metadata in photo and video files of various formats.")
 (define-public shotwell
   (package
     (name "shotwell")
-    (version "0.23.4")
+    (version "0.23.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -3850,40 +3850,28 @@ metadata in photo and video files of various formats.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1hnl0lxibklmr1cy95ij1b3jgvdsw4zlcja53ngfxvlsi2r2bbxi"))))
+                "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)
        ("itstool" ,itstool)
        ("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")
-- 
cgit v1.2.3

select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Alex Lam S.L &lt;alexlamsl@gmail.com&gt;</td><td class='right'>2021-03-02 19:32:58 +0000</td></tr>
<tr><th>committer</th><td>GitHub &lt;noreply@github.com&gt;</td><td class='right'>2021-03-03 03:32:58 +0800</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/tracifyjs/commit/test/compress/node_version.js?h=templatifyjs&amp;id=955411e0657cbaea3226537b2738307d10754b02'>955411e0657cbaea3226537b2738307d10754b02</a> (<a href='/tracifyjs/patch/test/compress/node_version.js?id=955411e0657cbaea3226537b2738307d10754b02'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/tracifyjs/tree/?h=templatifyjs&amp;id=955411e0657cbaea3226537b2738307d10754b02'>6580fa1e3502f744d271978c3ef412cfe73521c5</a> /<a href='/tracifyjs/tree/test/compress/node_version.js?h=templatifyjs&amp;id=955411e0657cbaea3226537b2738307d10754b02'>test/compress/node_version.js</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/tracifyjs/commit/test/compress/node_version.js?h=templatifyjs&amp;id=adcafce04852bb4730e3e699dfdd656dc018cd0f'>adcafce04852bb4730e3e699dfdd656dc018cd0f</a> (<a href='/tracifyjs/diff/test/compress/node_version.js?h=templatifyjs&amp;id=955411e0657cbaea3226537b2738307d10754b02&amp;id2=adcafce04852bb4730e3e699dfdd656dc018cd0f'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/tracifyjs/snapshot/tracifyjs-955411e0657cbaea3226537b2738307d10754b02.tar.gz'>tracifyjs-955411e0657cbaea3226537b2738307d10754b02.tar.gz</a><br/><a href='/tracifyjs/snapshot/tracifyjs-955411e0657cbaea3226537b2738307d10754b02.zip'>tracifyjs-955411e0657cbaea3226537b2738307d10754b02.zip</a><br/></td></tr></table>
<div class='commit-subject'>fix corner cases with `class` (#4723)</div><div class='commit-msg'>fixes #4720
fixes #4721
fixes #4722</div><div class='diffstat-header'><a href='/tracifyjs/diff/?h=templatifyjs&amp;id=955411e0657cbaea3226537b2738307d10754b02'>Diffstat</a> (limited to 'test/compress/node_version.js')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>