[packages/icedtea7] - fix building with giflib 5.1 - rel 4

[baggins]

commit 6bccd708480cb07b2ba3a0f359e69af633ac689b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Oct 29 08:19:27 2014 +0100

    - fix building with giflib 5.1
    - rel 4

 icedtea7-giflib.patch | 14 ++++++++++++++
 icedtea7.spec         |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/icedtea7.spec b/icedtea7.spec
index e844619..a14ea9a 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -28,7 +28,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea7
 Version:	2.5.3
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.wildebeest.org/download/source/icedtea-%{version}.tar.gz
@@ -51,6 +51,7 @@ Source10:	make-cacerts.sh
 # 0-99 patches for the IcedTea files
 # 100-... patches applied to the extracted sources
 Patch100:	%{name}-libpath.patch
+Patch101:	%{name}-giflib.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 BuildRequires:	ant
@@ -62,7 +63,7 @@ BuildRequires:	cups-devel
 BuildRequires:	/usr/bin/jar
 BuildRequires:	freetype-devel >= 2.3
 BuildRequires:	gawk
-BuildRequires:	giflib-devel
+BuildRequires:	giflib-devel >= 5.1
 BuildRequires:	glib2-devel
 BuildRequires:	glibc-misc
 BuildRequires:	gtk+2-devel
@@ -406,6 +407,7 @@ Przykłady dla OpenJDK.
 # patches to applied to the extracted sources
 install -d pld-patches
 cp -p %{PATCH100} pld-patches
+cp -p %{PATCH101} pld-patches
 
 # let the build system extract the sources where it wants them
 install -d drops
diff --git a/icedtea7-giflib.patch b/icedtea7-giflib.patch
new file mode 100644
index 0000000..59ad376
--- /dev/null
+++ b/icedtea7-giflib.patch
@@ -0,0 +1,14 @@
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c~       2014-10-02 04:17:19.000000000 +0200
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c        2014-10-29 00:23:14.428883127 +0100
+@@ -310,7 +310,10 @@
+     free(pBitmapBits);
+     free(pOldBitmapBits);
+ 
+-    DGifCloseFile(gif);
++    {
++    int error = 0;
++    DGifCloseFile(gif, &error);
++    }
+ 
+     return 1;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/6bccd708480cb07b2ba3a0f359e69af633ac689b