/hg/release/icedtea6-1.10: G356743: Support libpng 1.5.

[andrew at icedtea.classpath.org]

changeset 11db21f38d4b in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=11db21f38d4b
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 31 19:35:41 2011 +0100

	G356743: Support libpng 1.5.

	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.


diffstat:

 ChangeLog                        |   9 +++++++++
 Makefile.am                      |   1 +
 NEWS                             |   2 ++
 THANKYOU                         |   1 +
 patches/g356743-libpng-1.5.patch |  25 +++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 0 deletions(-)

diffs (81 lines):

diff -r 498cfc2126f8 -r 11db21f38d4b ChangeLog
--- a/ChangeLog	Thu Mar 31 17:22:30 2011 +0200
+++ b/ChangeLog	Thu Mar 31 19:35:41 2011 +0100
@@ -1,3 +1,12 @@
+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.
+
 2011-03-31  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 498cfc2126f8 -r 11db21f38d4b Makefile.am
--- a/Makefile.am	Thu Mar 31 17:22:30 2011 +0200
+++ b/Makefile.am	Thu Mar 31 19:35:41 2011 +0100
@@ -326,6 +326,7 @@
 	patches/jaxp-serial-version-uid.patch \
 	patches/openjdk/7023591-AAShapePipe.patch \
 	patches/openjdk/7027667-AAShapePipeRegTest.patch \
+	patches/g356743-libpng-1.5.patch \
 	patches/mark_sun_toolkit_privileged_code.patch
 
 if WITH_ALT_HSBUILD
diff -r 498cfc2126f8 -r 11db21f38d4b NEWS
--- a/NEWS	Thu Mar 31 17:22:30 2011 +0200
+++ b/NEWS	Thu Mar 31 19:35:41 2011 +0100
@@ -15,6 +15,8 @@
 * Backports
   - S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
   - Add missing privileged block around access to the sun.awt.nativedebug property.
+* 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 498cfc2126f8 -r 11db21f38d4b THANKYOU
--- a/THANKYOU	Thu Mar 31 17:22:30 2011 +0200
+++ b/THANKYOU	Thu Mar 31 19:35:41 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 498cfc2126f8 -r 11db21f38d4b patches/g356743-libpng-1.5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/g356743-libpng-1.5.patch	Thu Mar 31 19:35:41 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 */
+