[patch] Patch ebuild to apply fix

gentoo383737a.patch (text/plain), 3.10 KB, created by Martin von Gagern on 2011-09-22 09:37:34 UTC

Index: dev-java/icedtea/files/7.1.14-libpng15.patch
===================================================================
--- dev-java/icedtea/files/7.1.14-libpng15.patch	(revision 0)
+++ dev-java/icedtea/files/7.1.14-libpng15.patch	(revision 0)
@@ -0,0 +1,42 @@
+Taken from http://hg.openjdk.java.net/icedtea/jdk7/jdk/raw-rev/e46d527097f1
+and paths adjusted to match icedtea unpacked source tree.
+
[phone] Martin von Gagern
+
+References:
+ - https://bugs.gentoo.org/383737
+
+# HG changeset patch
+# User andrew
+# Date 1312327987 -3600
+# Node ID e46d527097f175065b6454a306db52cbf5a8884b
+# Parent ccf86bbc61fd717f83dbee5a246e903b5d23306b
+G356743: Support building against libpng 1.5.
+
+--- a/openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Fri Jul 29 16:00:32 2011 -0400
++++ b/openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Wed Aug 03 00:33:07 2011 +0100
+@@ -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 */
+ 
+
Index: dev-java/icedtea/icedtea-7.1.14.ebuild
===================================================================
--- dev-java/icedtea/icedtea-7.1.14.ebuild	(revision 8816)
+++ dev-java/icedtea/icedtea-7.1.14.ebuild	(working copy)
@@ -9,7 +9,7 @@
 
 EAPI="2"
 
-inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator
+inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator eutils
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="7"
@@ -244,6 +244,16 @@
 		$(use_enable xrender) \
 		$(use_enable systemtap) \
 		|| die "configure failed"
+
+	# Theoretically, extraction should go into src_unpack, but as we
+	# need to configure first, that's not an option. Next expected place
+	# might be src_compile, but adding it there would not allow users a
+	# look at the unpacked and patched source tree without triggering
+	# the build. So we extract here, even if this is not really a
+	# configuration step in the strict sense.
+	emake -j 1 extract || die "extract failed"
+	epatch "${FILESDIR}"/7.1.14-libpng15.patch
+	epatch_user
 }
 
 src_compile() {
@@ -255,6 +265,8 @@
 	# otherwise we try to load the least that's needed to avoid possible classpath collisions
 	export ANT_TASKS="xerces-2 xalan ant-nodeps"
 
+	export DISABLE_HOTSPOT_OS_VERSION_CHECK=ok # bug 382741
+
 	# Paludis does not respect unset from src_configure
 	unset_vars
 	emake -j 1  || die "make failed"