[geeqie] Disable libtiff usage, which crashes for some tiffs as mentioned

[Michael Schwendt]

commit 6aa0dda7e379b1dcf8568494524d3e8abba81a2f
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Dec 13 14:43:53 2012 +0100

    Disable libtiff usage, which crashes for some tiffs as mentioned
    
      on geeqie-devel list.

 geeqie-1.1-disable-custom-tiff-loader.patch |   12 ++++++++++++
 geeqie.spec                                 |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/geeqie-1.1-disable-custom-tiff-loader.patch b/geeqie-1.1-disable-custom-tiff-loader.patch
new file mode 100644
index 0000000..18d386e
--- /dev/null
+++ b/geeqie-1.1-disable-custom-tiff-loader.patch
@@ -0,0 +1,12 @@
+diff -Nur geeqie-1.1-orig/src/image-load.c geeqie-1.1/src/image-load.c
+--- geeqie-1.1-orig/src/image-load.c	2012-08-12 22:13:41.000000000 +0200
++++ geeqie-1.1/src/image-load.c	2012-12-13 14:40:25.211947484 +0100
+@@ -546,7 +546,7 @@
+ 		}
+ 	else
+ #endif
+-#ifdef HAVE_TIFF
++#ifdef HAVE_TIFF_BUT_THIS_IS_UNSTABLE
+ 	if (il->bytes_total >= 10 &&
+ 	    (memcmp(il->mapped_file, "MM\0*", 4) == 0 ||
+ 	     memcmp(il->mapped_file, "II*\0", 4) == 0))
diff --git a/geeqie.spec b/geeqie.spec
index c1b4628..dafcd5f 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -15,6 +15,9 @@ Patch0: geeqie-1.1-LDFLAGS.patch
 Patch1: geeqie-1.1-bar_keywords.c.diff
 # in upstream bug tracker
 Patch2: geeqie-1.0-fix-fullscreen.patch
+# disable libtiff usage, which crashes for some tiffs
+# as mentioned on geeqie-devel list
+Patch3: geeqie-1.1-disable-custom-tiff-loader.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
@@ -57,6 +60,7 @@ done
 %patch0 -p1 -b .LDFLAGS
 %patch1 -p1 -b .keywords
 %patch2 -p1 -b .fix-fullscreen
+%patch3 -p1 -b .disable-libtiff-usage
 
 
 %build
@@ -105,6 +109,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Dec 13 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-4
+- Disable libtiff usage, which crashes for some tiffs as mentioned
+  on geeqie-devel list.
+
 * Thu Nov 22 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-3
 - Merge a patch to fix fullscreen mode.