[packages/imlib] - added giflib patch (update to giflib 5 API) - release 22

[qboosh]

commit 9519102e1e60f44141a20c5bdda713310b581b0d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 2 09:45:13 2014 +0100

    - added giflib patch (update to giflib 5 API)
    - release 22

 imlib-giflib.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 imlib.spec         |  8 ++++--
 2 files changed, 87 insertions(+), 3 deletions(-)
---
diff --git a/imlib.spec b/imlib.spec
index 57fcc01..10c5f28 100644
--- a/imlib.spec
+++ b/imlib.spec
@@ -6,7 +6,7 @@ Summary(pl.UTF-8):	Biblioteki do renderowania i ładowania grafiki pod X11R6
 Summary(pt_BR.UTF-8):	Biblioteca de carga e renderização para X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	21
+Release:	22
 Epoch:		1
 License:	LGPL v2
 Group:		X11/Libraries
@@ -25,10 +25,11 @@ Patch8:		%{name}-exa_fix.patch
 Patch9:		%{name}-ac.patch
 Patch10:	%{name}-libpng.patch
 Patch11:	%{name}-libpng15.patch
+Patch12:	%{name}-giflib.patch
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	giflib-devel
+BuildRequires:	giflib-devel >= 5
 BuildRequires:	gtk+-devel >= 1.2.1
 BuildRequires:	libjpeg-devel >= 6b-18
 BuildRequires:	libpng-devel >= 1.0.8
@@ -99,7 +100,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe oraz dokumentacja do imlib
 Summary(pt_BR.UTF-8):	Arquivos de inclusão, bibliotecas e documentação para a Imlib
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel
+Requires:	giflib-devel >= 5
 Requires:	libjpeg-devel
 Requires:	libpng-devel
 Requires:	libtiff-devel
@@ -155,6 +156,7 @@ Bibliotecas estáticas para desenvolvimento com imlib.
 %patch9 -p0
 %patch10 -p1
 %patch11 -p0
+%patch12 -p1
 
 %build
 %{__gettextize}
diff --git a/imlib-giflib.patch b/imlib-giflib.patch
new file mode 100644
index 0000000..6b35019
--- /dev/null
+++ b/imlib-giflib.patch
@@ -0,0 +1,82 @@
+--- imlib-1.9.15/gdk_imlib/io-gif.c.orig	2014-02-02 08:59:39.063076948 +0100
++++ imlib-1.9.15/gdk_imlib/io-gif.c	2014-02-02 09:09:41.823051652 +0100
+@@ -10,6 +10,12 @@
+ #else
+ #include <gif_lib.h>
+ 
++static void print_gif_error(int error_code)
++{
++  const char *err = GifErrorString(error_code);
++  fprintf(stderr, "gdk_imlib: giflib error %d: %s.\n", error_code, err);
++}
++
+ unsigned char      *
+ loader_gif(FILE *f, int *w, int *h, int *t)
+ {
+@@ -30,7 +36,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, NULL);
+ 
+   transp = -1;
+   data = NULL;
+@@ -43,14 +49,14 @@
+     {
+       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ 	{
+-	  PrintGifError();
++	  print_gif_error(gif->Error);
+ 	  rec = TERMINATE_RECORD_TYPE;
+ 	}
+       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ 	{
+ 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
+ 	    {
+-	      PrintGifError();
++	      print_gif_error(gif->Error);
+ 	      rec = TERMINATE_RECORD_TYPE;
+ 	    }
+ 	  *w = gif->Image.Width;
+--- imlib-1.9.15/Imlib/load.c.orig	2014-02-02 08:59:39.119743612 +0100
++++ imlib-1.9.15/Imlib/load.c	2014-02-02 09:16:12.426368593 +0100
+@@ -429,6 +429,12 @@
+ #endif /* HAVE_LIBTIFF */
+ 
+ #ifdef HAVE_LIBGIF
++static void print_gif_error(int error_code)
++{
++  const char *err = GifErrorString(error_code);
++  fprintf(stderr, "gdk_imlib: giflib error %d: %s.\n", error_code, err);
++}
++
+ unsigned char      *
+ _LoadGIF(ImlibData * id, FILE *f, int *w, int *h, int *t)
+ {
+@@ -452,7 +458,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, NULL);
+ 
+   if (!gif)
+     return NULL;
+@@ -460,14 +466,14 @@
+     {
+       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ 	{
+-	  PrintGifError();
++	  print_gif_error(gif->Error);
+ 	  rec = TERMINATE_RECORD_TYPE;
+ 	}
+       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ 	{
+ 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
+ 	    {
+-	      PrintGifError();
++	      print_gif_error(gif->Error);
+ 	      rec = TERMINATE_RECORD_TYPE;
+ 	    }
+ 	  *w = gif->Image.Width;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/imlib.git/commitdiff/9519102e1e60f44141a20c5bdda713310b581b0d