Mercurial > hg > release > icedtea6-1.10
changeset 2505:11db21f38d4b
G356743: Support libpng 1.5.
2011-03-28 Andrew John Hughes <ahughes@redhat.com>
Patch contributed by: Alexis Ballier <aballier@gentoo.org>
* Makefile.am: Add patch.
* THANKYOU: List Alexis.
* NEWS: Updated.
* patches/g356743-libpng-1.5.patch:
Patch to build against libpng 1.5.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 31 Mar 2011 19:35:41 +0100 |
parents | 498cfc2126f8 |
children | e63694eb18ec |
files | ChangeLog Makefile.am NEWS THANKYOU patches/g356743-libpng-1.5.patch |
diffstat | 5 files changed, 39 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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@redhat.com> + Patch contributed by: Alexis Ballier <aballier@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@redhat.com> * Makefile.am: Add new patch.
--- 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
--- 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.
--- 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@gentoo.org) Alon Bar-Lev (alon.barlev@gmail.com) C. K. Jester-Young (cky944@gmail.com) Torsten Werner (mail.twerner@googlemail.com) \ No newline at end of file
--- /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 */ +