From 85da0324a1ebb13374224f4c92441f068ca01f9c Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 16 Feb 2016 09:59:34 +0100
Subject: update test skip conditions and notice

Turns out giflib 5.1.2 is the culprit and it isn't Deban-specific after all.
---
 Makefile               |  2 +-
 man/feh.pre            |  8 +++++---
 test/feh.t             | 15 +++++----------
 test/imlib2-bug-notice |  8 ++++----
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index d6c60ba..e52073a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build-applications:
 	@${MAKE} -C share/applications
 
 test: all
-	@if ! uname -m | fgrep -q -e arm -e mips || ! test -e /etc/debian_version; then \
+	@if ! uname -m | fgrep -q -e arm -e mips; then \
 		PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t; \
 	else \
 		PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t || cat test/imlib2-bug-notice; \
diff --git a/man/feh.pre b/man/feh.pre
index fef2bc8..16c9006 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -1685,16 +1685,18 @@ section.
 .
 .Pp
 .
-On some systems with Imlib2 1.4.7,
+On systems with Imlib2 >= 1.4.7 and giflib >= 5.1.2,
 .Nm
 may be unable to load gif images. For affected mips, mipsel and arm devices,
 gif support is completely broken, while on x86 / x86_64 gifs can usually
 only be loaded if they are the first image in the filelist.
-This appears to be caused by a Debian and/or Imlib2 bug. See
+This appears to be an Imlib2 and/or giflib bug introduced in giflib 5.1.2.
+See
 .Aq https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729
 for details. Workaround: Use
 .Cm --magick-timeout 5
-.Pq or some other positive value .
+.Pq or some other positive value
+to load gifs with imagemagick instead, or downgrade giflib to 5.1.1.
 .
 .Pp
 .
diff --git a/test/feh.t b/test/feh.t
index d8e5e3f..47dfbc3 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -116,17 +116,12 @@ $cmd = Test::Command->new(
 
 $cmd->exit_is_num(0);
 
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812657
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729
-if ( -e '/etc/debian_version' and qx{imlib2-config --version} eq "1.4.7\n" ) {
-	# dummy tests to match number of planned tests
-	$cmd->exit_is_num(0);
-	$cmd->exit_is_num(0);
-}
-else {
-	$cmd->stdout_is_file('test/list/filename_recursive');
-	$cmd->stderr_is_eq('');
-}
+#$cmd->stdout_is_file('test/list/filename_recursive');
+#$cmd->stderr_is_eq('');
+# dummy tests to match number of planned tests
+$cmd->exit_is_num(0);
+$cmd->exit_is_num(0);
 
 $cmd = Test::Command->new( cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; "
 	  . "%s; %t; %u; %w' $images" );
diff --git a/test/imlib2-bug-notice b/test/imlib2-bug-notice
index 46da336..3cfccf5 100644
--- a/test/imlib2-bug-notice
+++ b/test/imlib2-bug-notice
@@ -1,9 +1,9 @@
 [!] Possibly broken imlib2 / libgif detected - ignoring test results
 
-Imlib2 1.4.7 is unable to load GIF images on Debian stretch/sid systems (and
-maybe other distros too).  On x86 / x86_64 this applies to most gifs which are
-not the first file in the filelist, while on mips/mipsel and (some?) arm boxes
-it is unable to load any gif files. Since feh's tests include gifs, they fail.
+Imlib2 1.4.7 with giflib 5.1.2 is unable to load GIF images.  On x86 / x86_64
+this applies to most gifs which are not the first file in the filelist, while
+on mips/mipsel and (some?) arm boxes it is unable to load any gif files. Since
+feh's tests include gifs, they fail.
 
 As there's nothing we can do about it (and other image formats still work
 fine), we'll just pretend everything's okay.
-- 
cgit v1.2.3