Accepting request 214325 from home:AndreasSchwab:f

- emacs-24.3-giflib5-interlace.patch: fix display of interlaced GIF images

OBS-URL: https://build.opensuse.org/request/show/214325
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=138

emacs-24.3-giflib5-interlace.patch

@@ -0,0 +1,19 @@
+2014-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix misdisplay of interlaced GIFs with libgif5 (Bug#16372).
+	* image.c (gif_load): libgif5 deinterlaces for us, so don't do
+	it again.
+
+Index: emacs-24.3/src/image.c
+===================================================================
+--- emacs-24.3.orig/src/image.c
++++ emacs-24.3/src/image.c
+@@ -7378,7 +7378,7 @@ gif_load (struct frame *f, struct image
+ 	  }
+ 
+       /* Apply the pixel values.  */
+-      if (gif->SavedImages[j].ImageDesc.Interlace)
++      if (GIFLIB_MAJOR < 5 && gif->SavedImages[j].ImageDesc.Interlace)
+ 	{
+ 	  int row, pass;
+ 

emacs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 18 09:47:37 UTC 2014 - schwab@linux-m68k.org
+
+- emacs-24.3-giflib5-interlace.patch: fix display of interlaced GIF images
+
 -------------------------------------------------------------------
 Wed Jan 15 10:31:16 UTC 2014 - werner@suse.de
 

emacs.spec

@@ -103,6 +103,7 @@ Patch16:        emacs-24.3-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
 Patch25:        emacs-24.3-giflib5.patch
 Patch26:        emacs-24.3-nntp-typhoon-fix.patch
+Patch27:        emacs-24.3-giflib5-interlace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -216,6 +217,7 @@ and most assembler-like syntaxes.
 %patch22 -p0
 %patch25 -p0
 %patch26 -p1 
+%patch27 -p1 
 
 %if %{without autoconf}
 # We don't want to run autoconf