[gthumb] Added upstream patch to fix a crash in gthumb's file manager

[Christian Krause]

commit 5848742e6cc1c5d487b36c25c1a52cbebab1c7a4
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Aug 20 01:40:35 2013 +0200

    Added upstream patch to fix a crash in gthumb's file manager
    
      (rhbz#995551)
    - Added a patch to fix a crash when using the Audio/Video
      extension (rhbz#995724)

 ...-fixed-crash-when-copying-or-moving-files.patch |   25 ++++++++++++++++++++
 gthumb-3.2.3-gstvideo.patch                        |   13 ++++++++++
 gthumb.spec                                        |   21 ++++++++++++++++-
 3 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/0001-fixed-crash-when-copying-or-moving-files.patch b/0001-fixed-crash-when-copying-or-moving-files.patch
new file mode 100644
index 0000000..705651d
--- /dev/null
+++ b/0001-fixed-crash-when-copying-or-moving-files.patch
@@ -0,0 +1,25 @@
+From 8535630899875e6486556362e7ef192f3db2eb3e Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+Date: Thu, 15 Aug 2013 20:21:48 +0200
+Subject: [PATCH] fixed crash when copying or moving files
+
+[bug #705877]
+---
+ extensions/file_manager/actions.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/extensions/file_manager/actions.c b/extensions/file_manager/actions.c
+index d783b04..6516b72 100644
+--- a/extensions/file_manager/actions.c
++++ b/extensions/file_manager/actions.c
+@@ -897,7 +897,6 @@ copy_files_to_folder (GthBrowser *browser,
+ 			  data);
+ 	gth_browser_exec_task (browser, task, FALSE);
+ 
+-	g_object_unref (task);
+ 	g_object_unref (file_source);
+ }
+ 
+-- 
+1.8.1.4
+
diff --git a/gthumb-3.2.3-gstvideo.patch b/gthumb-3.2.3-gstvideo.patch
new file mode 100644
index 0000000..27e47c2
--- /dev/null
+++ b/gthumb-3.2.3-gstvideo.patch
@@ -0,0 +1,13 @@
+diff -uNr gthumb-3.2.3.old/configure.ac gthumb-3.2.3/configure.ac
+--- gthumb-3.2.3.old/configure.ac	2013-07-10 15:33:28.000000000 +0200
++++ gthumb-3.2.3/configure.ac	2013-08-20 00:09:14.427548052 +0200
+@@ -216,7 +216,8 @@
+ if test x$enable_gstreamer = xyes ; then
+ 	PKG_CHECK_MODULES(GSTREAMER,
+ 			  [gstreamer-1.0 >= $GSTREAMER_REQUIRED
+-			   gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED],
++			   gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED
++			   gstreamer-video-1.0 >= $GSTREAMER_REQUIRED],
+ 			  [AC_DEFINE(HAVE_GSTREAMER, 1, [Have gstreamer])
+ 			   enable_gstreamer=yes],
+ 			  [enable_gstreamer=no])
diff --git a/gthumb.spec b/gthumb.spec
index 361453f..7eb3920 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,9 +1,15 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 3.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://live.gnome.org/gthumb
 Source0: http://download.gnome.org/sources/gthumb/3.2/%{name}-%{version}.tar.xz
+# Upstream patch to fix a crash in gthumb's file manager
+# https://git.gnome.org/browse/gthumb/commit/?h=gthumb-3-2&id=8535630899875e6486556362e7ef192f3db2eb3e
+Patch0: 0001-fixed-crash-when-copying-or-moving-files.patch
+# Patch to fix a crash when using the Audio/Video extension
+# Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=706343
+Patch1: gthumb-3.2.3-gstvideo.patch
 License: GPLv2+
 Group: User Interface/X
 
@@ -32,6 +38,8 @@ BuildRequires: libsecret-devel
 BuildRequires: webkitgtk3-devel
 # For Web albums extension
 BuildRequires: bison flex
+# For gthumb-3.2.3-gstvideo.patch
+BuildRequires: automake autoconf yelp-tools
 
 Requires: hicolor-icon-theme
 
@@ -50,10 +58,15 @@ package.
 
 %prep
 %setup -q
+%patch0 -p1 -b.thumbnail-crash
+%patch1 -p1 -b.gstvideo
 # force regeneration
 rm -f extensions/importer/gth-import-enum-types.[hc]
 rm -f extensions/pixbuf_savers/enum-types.[hc]
 rm -f data/gthumb.schemas
+# For gthumb-3.2.3-gstvideo.patch
+aclocal
+autoconf
 
 %build
 %configure --enable-libopenraw --disable-static
@@ -117,6 +130,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Aug 19 2013 Christian Krause <chkr at fedoraproject.org> - 3.2.3-4
+- Added upstream patch to fix a crash in gthumb's file manager
+  (rhbz#995551)
+- Added a patch to fix a crash when using the Audio/Video
+  extension (rhbz#995724)
+
 * Fri Aug 09 2013 Kalev Lember <kalevlember at gmail.com> - 3.2.3-3
 - Rebuilt for cogl 1.15.4 soname bump