/hg/icedtea6: Move patches/libpng.patch to patches/openjdk/69591...

[omajid at icedtea.classpath.org]

changeset 0dad4d8420ac in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0dad4d8420ac
author: Omair Majid <omajid at redhat.com>
date: Thu May 12 11:22:12 2011 -0400

	Move patches/libpng.patch to patches/openjdk/6959123-libpng_14.patch

	This patch has been acceppted upstream. Move patch to openjdk dir
	and add commit information to clarify that it is upstream.

	2011-05-12 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch
	with patches/openjdk/6959123-libpng_14.patch.
	    * patches/libpng.patch: Remove.
	    * patches/openjdk/6959123-libpng_14.patch: New file.


diffstat:

 ChangeLog                               |   7 +++++++
 Makefile.am                             |   2 +-
 patches/libpng.patch                    |  11 -----------
 patches/openjdk/6959123-libpng_14.patch |  20 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 12 deletions(-)

diffs (67 lines):

diff -r d8750486e54c -r 0dad4d8420ac ChangeLog
--- a/ChangeLog	Wed May 11 20:27:41 2011 -0400
+++ b/ChangeLog	Thu May 12 11:22:12 2011 -0400
@@ -1,3 +1,10 @@
+2011-05-12  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with
+	patches/openjdk/6959123-libpng_14.patch.
+	* patches/libpng.patch: Remove.
+	* patches/openjdk/6959123-libpng_14.patch: New file.
+
 2011-05-11  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am
diff -r d8750486e54c -r 0dad4d8420ac Makefile.am
--- a/Makefile.am	Wed May 11 20:27:41 2011 -0400
+++ b/Makefile.am	Thu May 12 11:22:12 2011 -0400
@@ -265,7 +265,7 @@
 	patches/sh4-support.patch \
 	patches/policy-evaluation.patch \
 	patches/update-bootclasspath.patch \
-	patches/libpng.patch \
+	patches/openjdk/6959123-libpng_14.patch \
 	patches/applet_hole.patch \
 	patches/jtreg-httpTest.patch \
 	patches/arm.patch \
diff -r d8750486e54c -r 0dad4d8420ac patches/libpng.patch
--- a/patches/libpng.patch	Wed May 11 20:27:41 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-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);
diff -r d8750486e54c -r 0dad4d8420ac patches/openjdk/6959123-libpng_14.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6959123-libpng_14.patch	Thu May 12 11:22:12 2011 -0400
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User andrew
+# Date 1276015967 -3600
+# Node ID 4d55419ce99e749da5037fa4d8247117f1a5cc2e
+# Parent  be6f14f83ea7cfbb4b9d167d853b1fda420bb2cf
+6959123: Remove use of obsolete png_check_sig function in splashscreen_png.c
+Summary: Avoid use of deprecated libpng macro (removed in some 1.4.x releases)
+Reviewed-by: prr
+
+diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+@@ -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);