From bdad16b92a4f72ae9f49a785af4925848abce574 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 22 2011 11:48:06 +0000
Subject: Fix file cache NULL pointer crash in exif-common.c (#679256).

Patch and build with large file support.

---

diff --git a/geeqie-1.0-exif-filecache.patch b/geeqie-1.0-exif-filecache.patch
new file mode 100644
index 0000000..1a1a60d
--- /dev/null
+++ b/geeqie-1.0-exif-filecache.patch
@@ -0,0 +1,12 @@
+diff -Nur geeqie-1.0-orig/src/exif-common.c geeqie-1.0/src/exif-common.c
+--- geeqie-1.0-orig/src/exif-common.c	2010-02-17 22:21:19.000000000 +0100
++++ geeqie-1.0/src/exif-common.c	2011-02-22 12:37:11.233079477 +0100
+@@ -637,7 +637,7 @@
+ 
+ void exif_free_fd(FileData *fd, ExifData *exif)
+ {
+-	if (!fd) return;
++	if (!fd || !exif_cache) return;
+ 	g_assert(fd->exif == exif);
+ 	
+ 	file_cache_put(exif_cache, fd, 1);
diff --git a/geeqie-1.0-lfs-autoconf.patch b/geeqie-1.0-lfs-autoconf.patch
new file mode 100644
index 0000000..07456bc
--- /dev/null
+++ b/geeqie-1.0-lfs-autoconf.patch
@@ -0,0 +1,13 @@
+Subject: Build with large file support
+From: Michal Čihař <nijel@debian.org>
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3026317&group_id=222125&atid=1054682
+--- a/configure.in
++++ b/configure.in
+@@ -128,6 +128,7 @@
+ AC_PROG_CXX
+ AC_STDC_HEADERS
+ AC_ARG_PROGRAM
++AC_SYS_LARGEFILE
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ 
diff --git a/geeqie.spec b/geeqie.spec
index b31120c..3171e4a 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
@@ -11,6 +11,13 @@ Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
+
+# in upstream patch tracker
+Patch0: geeqie-1.0-lfs-autoconf.patch
+BuildRequires: autoconf
+# reported upstream
+Patch1: geeqie-1.0-exif-filecache.patch
+
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
@@ -22,8 +29,8 @@ BuildRequires: gnome-doc-utils
 BuildRequires: exiv2 fbida ImageMagick ufraw zenity
 Requires: exiv2 fbida ImageMagick ufraw zenity
 
-# Not in Fedora yet. It's a development release, btw.
-#BuildRequires: libchamplain-gtk-devel >= 0.3
+# Experimental, still disabled by default.
+#BuildRequires: libchamplain-gtk-devel >= 0.4
 
 %if 0%{?fedora} > 13
 # Replace GQView last stable release in Fedora space,
@@ -47,9 +54,12 @@ and zoom.
 for f in exiftran exiv2 mogrify ufraw-batch zenity ; do
     type $f || exit -1
 done
+%patch0 -p1 -b .lfs-autoconf
+%patch1 -p1 -b .exif-filecache
 
 
 %build
+autoreconf -f
 %configure --enable-lirc
 make %{?_smp_mflags}
 
@@ -99,6 +109,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Feb 22 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 1.0-8
+- Fix file cache NULL pointer crash in exif-common.c (#679256).
+- Patch and build with large file support.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild