/hg/release/icedtea6-1.9: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 7451a7b2b43e in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=7451a7b2b43e
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 01:20:54 2011 +0100

	Support buildnig against libpng 1.5.

	2011-10-13 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add new patch.
		* patches/libpng-1.5.patch: Support building against libpng
	1.5.


changeset baa3f10d0a8b in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=baa3f10d0a8b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 01:21:19 2011 +0100

	Added tag icedtea6-1.9.10 for changeset 7451a7b2b43e


diffstat:

 .hgtags                  |   1 +
 ChangeLog                |   6 ++++++
 Makefile.am              |   3 ++-
 patches/libpng-1.5.patch |  41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletions(-)

diffs (80 lines):

diff -r 28de6deb3971 -r baa3f10d0a8b .hgtags
--- a/.hgtags	Fri Oct 14 11:37:14 2011 +0100
+++ b/.hgtags	Wed Oct 19 01:21:19 2011 +0100
@@ -29,3 +29,4 @@
 9822da18c162896b9da66d45bdc341a1cd53581b icedtea6-1.9.7
 25b9909a5432b811f85b121305a6ba7f01c7aace icedtea6-1.9.8
 5eedbbda2c822758fd693f7b1ad9a73caca53471 icedtea6-1.9.9
+7451a7b2b43e5c529c53a28361693cd51fc41a18 icedtea6-1.9.10
diff -r 28de6deb3971 -r baa3f10d0a8b ChangeLog
--- a/ChangeLog	Fri Oct 14 11:37:14 2011 +0100
+++ b/ChangeLog	Wed Oct 19 01:21:19 2011 +0100
@@ -1,3 +1,9 @@
+2011-10-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/libpng-1.5.patch:
+	Support building against libpng 1.5.
+
 2011-10-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add additional patches.
diff -r 28de6deb3971 -r baa3f10d0a8b Makefile.am
--- a/Makefile.am	Fri Oct 14 11:37:14 2011 +0100
+++ b/Makefile.am	Wed Oct 19 01:21:19 2011 +0100
@@ -367,7 +367,8 @@
 	patches/shark-llvm-2.9.patch \
 	patches/mark_sun_toolkit_privileged_code.patch \
 	patches/fonts-rhel-version.patch \
-	patches/support_linux_3.patch
+	patches/support_linux_3.patch \
+	patches/libpng-1.5.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 28de6deb3971 -r baa3f10d0a8b patches/libpng-1.5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libpng-1.5.patch	Wed Oct 19 01:21:19 2011 +0100
@@ -0,0 +1,42 @@
+diff -r b139627f7bc3 src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Mon Nov 22 09:43:58 2010 +0800
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Tue Oct 18 13:55:10 2011 +0100
+@@ -31,12 +31,22 @@
+ 
+ #define SIG_BYTES 8
+ 
++#if (PNG_LIBPNG_VER < 10500)
++#define GET_IO_PTR(png_ptr) png_ptr->io_ptr
++#define JMPBUF(png_ptr) png_ptr->jmpbuf
++#define SET_READ_FN(png_ptr,iop,read_func) png_ptr->io_ptr = iop; png_ptr->read_data_fn = read_func;
++#else
++#define GET_IO_PTR(png_ptr) png_get_io_ptr(png_ptr)
++#define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
++#define SET_READ_FN(png_ptr,iop,read_func) png_set_read_fn(png_ptr,iop,read_func);
++#endif
++
+ void PNGAPI
+ my_png_read_stream(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+     png_uint_32 check;
+ 
+-    SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
++    SplashStream * stream = (SplashStream*)GET_IO_PTR(png_ptr);
+     check = stream->read(stream, data, length);
+     if (check != length)
+         png_error(png_ptr, "Read Error");
+@@ -71,12 +81,11 @@
+         goto done;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(JMPBUF(png_ptr))) {
+         goto done;
+     }
+ 
+-    png_ptr->io_ptr = io_ptr;
+-    png_ptr->read_data_fn = read_func;
++    SET_READ_FN(png_ptr, io_ptr, read_func)
+ 
+     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */
+