[shotwell] Add patches for compatibility with Vala 0.17.2.

[Thomas Moschny]

commit 8f5dfbe5624ebaae590b4b661de5f76d16d7dac2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 14 19:06:08 2012 +0200

    Add patches for compatibility with Vala 0.17.2.
    
    Still not compiling on rawhide, due to http://redmine.yorba.org/issues/5553.

 shotwell-0.12.3-valac-0.17.2.patch |   39 ++++++++++++++++++++++++++++++++++++
 shotwell.spec                      |   16 +++++++++++---
 2 files changed, 51 insertions(+), 4 deletions(-)
---
diff --git a/shotwell-0.12.3-valac-0.17.2.patch b/shotwell-0.12.3-valac-0.17.2.patch
new file mode 100644
index 0000000..392f842
--- /dev/null
+++ b/shotwell-0.12.3-valac-0.17.2.patch
@@ -0,0 +1,39 @@
+diff --git a/Makefile b/Makefile
+index 61cc5e6..d73c906 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ ifndef VALAC
+ VALAC := valac
+ endif
+ VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
+-MIN_VALAC_VERSION := 0.15.2
++MIN_VALAC_VERSION := 0.17.2
+ INSTALL_PROGRAM := install
+ INSTALL_DATA := install -m 644
+ 
+diff --git a/debian/control b/debian/control
+index 5caa195..73e21a0 100644
+diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
+index 2771679..5cab99a 100644
+--- a/src/sidebar/Tree.vala
++++ b/src/sidebar/Tree.vala
+@@ -549,7 +549,8 @@ public class Sidebar.Tree : Gtk.TreeView {
+         if (only_children)
+             return;
+         
+-        store.remove(wrapper.get_iter());
++        Gtk.TreeIter iter = wrapper.get_iter();
++        store.remove(ref iter);
+         
+         if (selected_wrapper == wrapper)
+             selected_wrapper = null;
+@@ -641,7 +642,8 @@ public class Sidebar.Tree : Gtk.TreeView {
+         bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
+         
+         // remove from current position in tree
+-        store.remove(wrapper.get_iter());
++        Gtk.TreeIter iter = wrapper.get_iter();
++        store.remove(ref iter);
+         
+         Sidebar.Entry? parent = branch.get_parent(entry);
+         assert(parent != null);
diff --git a/shotwell.spec b/shotwell.spec
index f0b85cf..eb18080 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.12.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -9,13 +9,17 @@ Group:          Applications/Multimedia
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
 Source0:        http://www.yorba.org/download/shotwell/0.12/shotwell-%{version}.tar.bz2
-# http://trac.yorba.org/ticket/3379
+# http://redmine.yorba.org/issues/3379
 Source1:        shotwell-icons.tar.bz2
 # Fix installed prefix detection when invoked as /bin/shotwell
-# https://bugzilla.redhat.com/show_bug.cgi?id=812652
+# https://bugzilla.redhat.com/show_bug.cgi?id=812652 and
+# http://redmine.yorba.org/issues/5181
 Patch0:         shotwell-usrmove.patch
+# Allow compilation with (and require) Vala 0.17.2
+# http://redmine.yorba.org/issues/5453
+Patch1:         shotwell-0.12.3-valac-0.17.2.patch
 
-BuildRequires:  vala-devel >= 0.14
+BuildRequires:  vala-devel >= 0.17.2
 BuildRequires:  LibRaw-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -44,6 +48,7 @@ them, and share them with others.
 %prep
 %setup -q
 %patch0 -p1 -b .usrmove
+%patch1 -p1 -b .vala-0.17.2
 
 %build
 ./configure \
@@ -105,6 +110,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jul 14 2012 Thomas Moschny <thomas.moschny at gmx.de> - 0.12.3-3
+- Add patches for compatibility with Vala 0.17.2.
+
 * Sat Jul 14 2012 Michel Salim <salimma at fedoraproject.org> - 0.12.3-2
 - Rebuild for libgphoto2 2.5.0