[IcedTea6 1.10] RFC: Add support for libpng 1.5

[Dr Andrew John Hughes]

The attached patch adds support for libpng 1.5 and was contributed
by Alexis Ballier via the Gentoo bug database:

https://bugs.gentoo.org/show_bug.cgi?id=356743

The patch is already on HEAD and I'd like to add it to the 1.10
branch.  It still compiles fine against libpng 1.4.5.

Ok for 1.10?

2011-03-28  Andrew John Hughes  <ahughes at redhat.com>
	Patch contributed by: Alexis Ballier <aballier at gentoo.org>

	* Makefile.am: Add patch.
	* THANKYOU: List Alexis.
	* NEWS: Updated.
	* patches/g356743-libpng-1.5.patch:
	Patch to build against libpng 1.5.

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37
-------------- next part --------------
diff -r 2b50c801e31b Makefile.am
--- a/Makefile.am	Sat Mar 26 08:27:56 2011 +0100
+++ b/Makefile.am	Tue Mar 29 15:09:00 2011 +0100
@@ -325,7 +325,8 @@
 	patches/pr600-arm-jvm.cfg.patch \
 	patches/jaxp-serial-version-uid.patch \
 	patches/openjdk/7023591-AAShapePipe.patch \
-	patches/openjdk/7027667-AAShapePipeRegTest.patch
+	patches/openjdk/7027667-AAShapePipeRegTest.patch \
+	patches/g356743-libpng-1.5.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 2b50c801e31b NEWS
--- a/NEWS	Sat Mar 26 08:27:56 2011 +0100
+++ b/NEWS	Tue Mar 29 15:09:00 2011 +0100
@@ -14,6 +14,8 @@
 * HotSpot 20 updated to b11.
 * Backports
   - S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
+* Fixes
+  - G356743: Support libpng 1.5.
 * CACAO
   - Ignore all unknown options, but report them.
   - Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc.
diff -r 2b50c801e31b THANKYOU
--- a/THANKYOU	Sat Mar 26 08:27:56 2011 +0100
+++ b/THANKYOU	Tue Mar 29 15:09:00 2011 +0100
@@ -4,6 +4,7 @@
 patches. If your name does not appear on either list, but should, let
 us know. Please keep this list in alphabetic order.
 
+Alexis Ballier (aballier at gentoo.org)
 Alon Bar-Lev (alon.barlev at gmail.com)
 C. K. Jester-Young  (cky944 at gmail.com)
 Torsten Werner (mail.twerner at googlemail.com)
\ No newline at end of file
diff -r 2b50c801e31b patches/g356743-libpng-1.5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/g356743-libpng-1.5.patch	Tue Mar 29 15:09:00 2011 +0100
@@ -0,0 +1,26 @@
+--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+@@ -36,7 +36,7 @@ my_png_read_stream(png_structp png_ptr,
+ {
+     png_uint_32 check;
+ 
+-    SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
++    SplashStream * stream = (SplashStream*)png_get_io_ptr(png_ptr);
+     check = stream->read(stream, data, length);
+     if (check != length)
+         png_error(png_ptr, "Read Error");
+@@ -71,12 +71,11 @@ SplashDecodePng(Splash * splash, png_rw_
+         goto done;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         goto done;
+     }
+ 
+-    png_ptr->io_ptr = io_ptr;
+-    png_ptr->read_data_fn = read_func;
++    png_set_read_fn(png_ptr, io_ptr, read_func);
+ 
+     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */
+