/hg/release/icedtea6-1.7: Patch splashscreen to build against li...

[andrew at icedtea.classpath.org]

changeset be3968e8941c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=be3968e8941c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 27 17:38:39 2010 +0000

	Patch splashscreen to build against libpng 1.4.

	2010-01-27 Andrew John Hughes <ahughes at redhat.com>

	 * HACKING: Document new patch.
		* Makefile.am: Add new patch.
		* patches/libpng.patch: Patch splashscreen code so that
	it will build against libpng 1.4 (png_check_sig -->
	png_sig_cmp)


diffstat:

4 files changed, 30 insertions(+), 7 deletions(-)
ChangeLog            |   21 +++++++++++++++------
HACKING              |    1 +
Makefile.am          |    3 ++-
patches/libpng.patch |   12 ++++++++++++

diffs (75 lines):

diff -r de28f0f20623 -r be3968e8941c ChangeLog
--- a/ChangeLog	Wed Jan 27 15:59:17 2010 +0000
+++ b/ChangeLog	Wed Jan 27 17:38:39 2010 +0000
@@ -1,3 +1,18 @@ 2010-01-27  Matthias Klose  <doko at ubuntu
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+	
+	* HACKING: Document new patch.
+	* Makefile.am: Add new patch.
+	* patches/libpng.patch:
+	Patch splashscreen code so that
+	it will build against libpng 1.4
+	(png_check_sig --> png_sig_cmp)
+
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Add missing items for 1.5.1, 1.5.2,
+	1.5.3, 1.6.1 and 1.6.2.
+	
 2010-01-27  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
@@ -10,12 +25,6 @@ 2010-01-26 Andrew John Hughes  <ahughes@
 	a target for building the plugin tests.
 	(plugin-tests): Alias for the above.
 
-2010-01-26 Andrew John Hughes  <ahughes at redhat.com>
-
-	* NEWS:
-	Add missing items for 1.5.1, 1.5.2,
-	1.5.3, 1.6.1 and 1.6.2.
-	
 2010-01-26  Deepak Bhole <dbhole at redhat.com>
 
 	* NEWS: Added message about alpha release for the new NPR based plugin.
diff -r de28f0f20623 -r be3968e8941c HACKING
--- a/HACKING	Wed Jan 27 15:59:17 2010 +0000
+++ b/HACKING	Wed Jan 27 17:38:39 2010 +0000
@@ -115,6 +115,7 @@ The following patches are only applied t
 * openjdk/6648816.patch: Backport of regression (NPE) fix in AccessControlContext (PR364/S6648816)
 * icedtea-nss-config.patch: Add the NSS PKCS11 security provider. (PR356)
 * icedtea-nss-6763530.patch: Fix PKCS11 provider when used with newer version of NSS (>=3.12.3) (PR356, S6763530).
+* libpng.patch: Use png_sig_cmp instead of png_check_sig so we can build against libpng 1.4.
 
 The following patches are only applied to OpenJDK in IcedTea:
 
diff -r de28f0f20623 -r be3968e8941c Makefile.am
--- a/Makefile.am	Wed Jan 27 15:59:17 2010 +0000
+++ b/Makefile.am	Wed Jan 27 17:38:39 2010 +0000
@@ -303,7 +303,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-6897844-xshm.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
 	patches/icedtea-parisc.patch \
-	patches/icedtea-sh4-support.patch
+	patches/icedtea-sh4-support.patch \
+	patches/libpng.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r de28f0f20623 -r be3968e8941c patches/libpng.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libpng.patch	Wed Jan 27 17:38:39 2010 +0000
@@ -0,0 +1,12 @@
+diff -r 93c580ce5e88 jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Fri Jan 15 08:41:51 2010 -0800
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Wed Jan 27 16:52:44 2010 +0000
+@@ -182,7 +182,7 @@
+     int success = 0;
+ 
+     stream->read(stream, sig, SIG_BYTES);
+-    if (!png_check_sig(sig, SIG_BYTES)) {
++    if (png_sig_cmp(sig, 0, SIG_BYTES)) {
+         goto done;
+     }
+     success = SplashDecodePng(splash, my_png_read_stream, stream);