[gphotoframe] A Happy New Year

[Mamoru TASAKA]

commit c3a2b49dba310644528e19877be60fb0e55aa6a4
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Jan 1 12:19:57 2015 +0900

    A Happy New Year
    
    - Adjust for gdk-pixbuf 2.31.2 API

 gphotoframe-2.0.1-gdk-pixbuf2-2_31_2_API.patch |   28 ++++++++++++++++++++++++
 gphotoframe.spec                               |   10 +++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/gphotoframe-2.0.1-gdk-pixbuf2-2_31_2_API.patch b/gphotoframe-2.0.1-gdk-pixbuf2-2_31_2_API.patch
new file mode 100644
index 0000000..c16f43d
--- /dev/null
+++ b/gphotoframe-2.0.1-gdk-pixbuf2-2_31_2_API.patch
@@ -0,0 +1,28 @@
+--- gphotoframe-2.0.1-hg0eed26d75481/lib/image/actor/base.py.pixbuf_23102	2014-12-05 11:50:25.000000000 +0900
++++ gphotoframe-2.0.1-hg0eed26d75481/lib/image/actor/base.py	2015-01-01 12:04:45.984341399 +0900
+@@ -41,7 +41,10 @@
+ 
+         # FIXME
+         tmp_file = os.path.join(CACHE_DIR, 'gphotoframe_tmp.png')
+-        pixbuf.savev(tmp_file, 'png', [], [])
++        try:
++          pixbuf.savev(tmp_file, 'png', [], [])
++        except:
++          pixbuf.save(tmp_file, 'png', [], [])
+         self.set_from_file(tmp_file)
+ 
+ #         self.set_from_rgb_data(
+--- gphotoframe-2.0.1-hg0eed26d75481/lib/image/gtkimage.py.pixbuf_23102	2014-12-05 11:50:25.000000000 +0900
++++ gphotoframe-2.0.1-hg0eed26d75481/lib/image/gtkimage.py	2015-01-01 12:05:12.575522238 +0900
+@@ -131,7 +131,10 @@
+             url = photo.get('url')
+             path = 'thumb_' + url.replace('/', '_')
+             filename = os.path.join(CACHE_DIR, path)
+-            pixbuf.savev(filename, "jpeg", [], [])
++            try:
++              pixbuf.savev(filename, "jpeg", [], [])
++            except:
++              pixbuf.save(filename, "jpeg", [], [])
+ 
+         self.data = pixbuf
+         return True
diff --git a/gphotoframe.spec b/gphotoframe.spec
index bbd5efc..e5da00e 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -14,7 +14,7 @@
 %global	mainver	2.0.1
 #%%define	minorver	-b1
 
-%global	mainrel	2
+%global	mainrel	3
 
 %global	rpmminorver	%(echo "%minorver" | sed -e 's|^-||' | sed -e 's|\\\.||')
 %global	fedorarel	%{?minorver:0.}%{mainrel}%{?minorver:.%rpmminorver}%{?hghash:.hg%hghash}
@@ -44,6 +44,9 @@ Patch2:	gphotoframe-2.0a2-parseexif-geom-zerovalue.patch
 Patch3:	gphotoframe-1.5.1-parseexif-fraction-zerodiv.patch
 # Support python-twisted 13.x API
 #Patch4:	gphotoframe-2.0-a3-twisted-13-API.patch
+# https://git.gnome.org/browse/gdk-pixbuf/commit/?id=112eab418137df2d2f5f97e75fb48f17e7f771e7
+# gdk-pixbuf 2.31.2 changed API
+Patch4:	gphotoframe-2.0.1-gdk-pixbuf2-2_31_2_API.patch
 
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
@@ -98,6 +101,7 @@ for gnome-screensaver compatibility.
 
 %patch2 -p2 -b .zeroden
 %patch3 -p1 -b .zeroden2
+%patch4 -p1 -b .pixbuf_23102
 
 # Remove unneeded shebangs
 grep -rl '^#![ \t]*%{_bindir}' lib/ | \
@@ -233,6 +237,10 @@ exit 0
 %{_datadir}/applications/screensavers/%{name}-screensaver.desktop
 
 %changelog
+* Thu Jan  1 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.1-3.hg0eed26d75481
+- A Happy New Year
+- Adjust for gdk-pixbuf 2.31.2 API
+
 * Fri Dec  5 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.1-2.hg0eed26d75481
 - Add appdata