/hg/release/icedtea6-1.12: PR1319: Support GIF lib v5.

[andrew at icedtea.classpath.org]

changeset bdd72e5a3d6b in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=bdd72e5a3d6b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Feb 15 03:27:10 2013 +0000

	PR1319: Support GIF lib v5.

	2013-02-14  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR1319: Support GIF lib v5.
		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* patches/pr1319-support_giflib_5.patch:
		Support building with giflib 5.x.
		* NEWS: Updated.


diffstat:

 ChangeLog                             |   9 +++++++++
 Makefile.am                           |   3 ++-
 NEWS                                  |   3 +++
 patches/pr1319-support_giflib_5.patch |  29 +++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r a9ed3f4af3ee -r bdd72e5a3d6b ChangeLog
--- a/ChangeLog	Wed Feb 13 23:57:03 2013 +0000
+++ b/ChangeLog	Fri Feb 15 03:27:10 2013 +0000
@@ -1,3 +1,12 @@
+2013-02-14  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR1319: Support GIF lib v5.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* patches/pr1319-support_giflib_5.patch:
+	Support building with giflib 5.x.
+	* NEWS: Updated.
+
 2013-02-13  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* configure.ac: Bump to 1.12.3pre.
diff -r a9ed3f4af3ee -r bdd72e5a3d6b Makefile.am
--- a/Makefile.am	Wed Feb 13 23:57:03 2013 +0000
+++ b/Makefile.am	Fri Feb 15 03:27:10 2013 +0000
@@ -503,7 +503,8 @@
 	patches/openjdk/7010849-modernise_sa.patch \
 	patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
 	patches/openjdk/8004341-jck_dialog_failure.patch \
-	patches/openjdk/8004341-jck_dialog_failure-02.patch
+	patches/openjdk/8004341-jck_dialog_failure-02.patch \
+	patches/pr1319-support_giflib_5.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r a9ed3f4af3ee -r bdd72e5a3d6b NEWS
--- a/NEWS	Wed Feb 13 23:57:03 2013 +0000
+++ b/NEWS	Fri Feb 15 03:27:10 2013 +0000
@@ -12,6 +12,9 @@
 
 New in release 1.12.3 (2013-02-XX):
 
+* Bug fixes
+  - PR1319: Support GIF lib v5.
+
 New in release 1.12.2 (2013-02-11):
 
 * Backports
diff -r a9ed3f4af3ee -r bdd72e5a3d6b patches/pr1319-support_giflib_5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr1319-support_giflib_5.patch	Fri Feb 15 03:27:10 2013 +0000
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User andrew
+# Date 1360886106 0
+# Node ID fd2187713a998a312ee76405f58df3719ec04db1
+# Parent  bbfd732ae37d02301b065722f9c7a930118adde3
+PR1319: Support building with giflib 5
+
+diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+@@ -316,9 +316,18 @@
+ int
+ SplashDecodeGifStream(Splash * splash, SplashStream * stream)
+ {
++#ifdef GIFLIB_MAJOR >= 5
++    int error = 0;
++    GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error);
++
++    if (error)
++	return 0;
++#else
+     GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc);
+ 
+     if (!gif)
+         return 0;
++#endif
++
+     return SplashDecodeGif(splash, gif);
+ }