Accepting request 158806 from home:seife:branches:openSUSE:Factory:Staging:giflib5

fix build with giflib5 by skipping configure test and adding emacs-24.2-giflib5.patch

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

emacs-24.2-giflib5.patch

@@ -0,0 +1,28 @@
+diff --git a/src/image.c b/src/image.c
+index 73490fe..7acd5a3 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -7176,7 +7176,11 @@ gif_load (struct frame *f, struct image *img)
+ 	}
+ 
+       /* Open the GIF file.  */
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpenFileName (SSDATA (file));
++#else
++      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
++#endif
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -7197,7 +7201,11 @@ gif_load (struct frame *f, struct image *img)
+       memsrc.len = SBYTES (specified_data);
+       memsrc.index = 0;
+ 
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++#else
++      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
++#endif
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);

emacs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 13 08:07:28 UTC 2013 - seife+obs@b1-systems.com
+
+- fix build with giflib5 by skipping configure test and adding
+  emacs-24.2-giflib5.patch
+
 -------------------------------------------------------------------
 Wed Feb 20 07:59:47 UTC 2013 - werner@suse.de
 

emacs.spec

@@ -88,6 +88,7 @@ Patch16:        emacs-23.1-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
 Patch23:        emacs-24.1-xevent.patch
 Patch24:        emacs-24.1-xgselect.patch
+Patch25:        emacs-24.2-giflib5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global bug_345669  0
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -191,6 +192,7 @@ modes.
 %patch22
 %patch23
 %patch24
+%patch25 -p1
 
 # We don't want to run autoconf
 touch configure src/stamp-h.in
@@ -350,6 +352,11 @@ make_mchkoff ()
 	export MALLOC_CHECK_
     fi
 }
+
+# new giflib5 does not have this function and it is unused anyway...
+ac_cv_lib_gif_EGifPutExtensionLast=yes
+export ac_cv_lib_gif_EGifPutExtensionLast
+
 CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
 make_mchkoff bootstrap
 make -C lisp updates compile