[geeqie] Build with --disable-tiff, as the custom libtiff loader crashes

Michael Schwendt mschwendt at fedoraproject.org
Thu Dec 13 13:52:01 UTC 2012


commit 1a4171c67ade10059e5013a2b7a68846a755c360
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Dec 13 14:51:56 2012 +0100

    Build with --disable-tiff, as the custom libtiff loader crashes
    
      for some images as mentioned on geeqie-devel list.

 geeqie-1.1-disable-custom-tiff-loader.patch |   12 ------------
 geeqie.spec                                 |   12 ++++--------
 2 files changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/geeqie.spec b/geeqie.spec
index dafcd5f..64e0436 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -15,16 +15,13 @@ 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
 BuildRequires: exiv2-devel
 BuildRequires: lirc-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
+#BuildRequires: libtiff-devel
 BuildRequires: gettext intltool desktop-file-utils
 BuildRequires: gnome-doc-utils
 
@@ -60,11 +57,10 @@ done
 %patch0 -p1 -b .LDFLAGS
 %patch1 -p1 -b .keywords
 %patch2 -p1 -b .fix-fullscreen
-%patch3 -p1 -b .disable-libtiff-usage
 
 
 %build
-%configure --enable-lirc
+%configure --enable-lirc --disable-tiff
 make %{?_smp_mflags}
 
 
@@ -110,8 +106,8 @@ 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.
+- Build with --disable-tiff, as the custom libtiff loader crashes
+  for some images 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.


More information about the scm-commits mailing list