Mercurial > hg > release > icedtea6-1.13
changeset 2968:0f212e1c6cb4
S8009641: OpenJDK 6 build broken via 8007675 fix
2013-03-07 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/security/20130304/declaration_correction.patch:
Remove local patch...
* Makefile.am: Swap patches.
* NEWS: Updated.
* patches/openjdk/8009641-8007675_build_fix.patch:
...replaced by this from upstream.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Thu, 07 Mar 2013 15:48:35 +0000 |
| parents | 7088315fb75f |
| children | e162a16dad26 |
| files | ChangeLog Makefile.am NEWS patches/openjdk/8009641-8007675_build_fix.patch patches/security/20130304/declaration_correction.patch |
| diffstat | 5 files changed, 61 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 07 13:21:49 2013 +0000 +++ b/ChangeLog Thu Mar 07 15:48:35 2013 +0000 @@ -1,3 +1,12 @@ +2013-03-07 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/security/20130304/declaration_correction.patch: + Remove local patch... + * Makefile.am: Swap patches. + * NEWS: Updated. + * patches/openjdk/8009641-8007675_build_fix.patch: + ...replaced by this from upstream. + 2013-03-07 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS:
--- a/Makefile.am Thu Mar 07 13:21:49 2013 +0000 +++ b/Makefile.am Thu Mar 07 15:48:35 2013 +0000 @@ -279,7 +279,7 @@ patches/security/20130219/8007688.patch \ patches/security/20130304/8007014.patch \ patches/security/20130304/8007675.patch \ - patches/security/20130304/declaration_correction.patch + patches/openjdk/8009641-8007675_build_fix.patch if !WITH_ALT_HSBUILD SECURITY_PATCHES += \
--- a/NEWS Thu Mar 07 13:21:49 2013 +0000 +++ b/NEWS Thu Mar 07 15:48:35 2013 +0000 @@ -14,6 +14,8 @@ * New features - PR1317: Provide an option to build with a more up-to-date HotSpot +* Backports + - S8009641: OpenJDK 6 build broken via 8007675 fix * Bug fixes - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8009641-8007675_build_fix.patch Thu Mar 07 15:48:35 2013 +0000 @@ -0,0 +1,49 @@ +# HG changeset patch +# User bae +# Date 1362669637 -10800 +# Node ID c73944a23b44ead9aa552ffaa4346bda08940ed3 +# Parent 9714f53ef17344fbcb6dc2249a7b238e6292f726 +8009641: OpenJDK 6 build broken via 8007675 fix +Reviewed-by: andrew + +diff --git a/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java b/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java +--- openjdk/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java ++++ openjdk/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java +@@ -572,14 +572,14 @@ + dst, dst.length/getNumOutComponents(), + LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) | + LCMSImageLayout.BYTES_SH(2), getNumOutComponents()*2); ++ ++ synchronized(this) { ++ LCMS.colorConvert(this, srcIL, dstIL); ++ } + } catch (ImageLayoutException e) { + throw new CMMException("Unable to convert data"); + } + +- synchronized(this) { +- LCMS.colorConvert(this, srcIL, dstIL); +- } +- + return dst; + } + +@@ -598,14 +598,14 @@ + dst, dst.length/getNumOutComponents(), + LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) | + LCMSImageLayout.BYTES_SH(1), getNumOutComponents()); ++ ++ synchronized(this) { ++ LCMS.colorConvert(this, srcIL, dstIL); ++ } + } catch (ImageLayoutException e) { + throw new CMMException("Unable to convert data"); + } + +- synchronized(this) { +- LCMS.colorConvert(this, srcIL, dstIL); +- } +- + return dst; + } + }
--- a/patches/security/20130304/declaration_correction.patch Thu Mar 07 13:21:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ ---- openjdk.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 2013-03-07 12:17:44.080685352 +0000 -+++ openjdk/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 2013-03-07 12:39:57.202035054 +0000 -@@ -557,18 +557,19 @@ - /* the number of colors is (size of the array) / (number of input/output - components */ - public short[] colorConvert(short[] src, short[] dst) { -+ LCMSImageLayout srcIL, dstIL; - - if (dst == null) { - dst = new short [(src.length/getNumInComponents())*getNumOutComponents()]; - } - - try { -- LCMSImageLayout srcIL = new LCMSImageLayout( -+ srcIL = new LCMSImageLayout( - src, src.length/getNumInComponents(), - LCMSImageLayout.CHANNELS_SH(getNumInComponents()) | - LCMSImageLayout.BYTES_SH(2), getNumInComponents()*2); - -- LCMSImageLayout dstIL = new LCMSImageLayout( -+ dstIL = new LCMSImageLayout( - dst, dst.length/getNumOutComponents(), - LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) | - LCMSImageLayout.BYTES_SH(2), getNumOutComponents()*2); -@@ -584,17 +585,19 @@ - } - - public byte[] colorConvert(byte[] src, byte[] dst) { -+ LCMSImageLayout srcIL, dstIL; -+ - if (dst == null) { - dst = new byte [(src.length/getNumInComponents())*getNumOutComponents()]; - } - - try { -- LCMSImageLayout srcIL = new LCMSImageLayout( -+ srcIL = new LCMSImageLayout( - src, src.length/getNumInComponents(), - LCMSImageLayout.CHANNELS_SH(getNumInComponents()) | - LCMSImageLayout.BYTES_SH(1), getNumInComponents()); - -- LCMSImageLayout dstIL = new LCMSImageLayout( -+ dstIL = new LCMSImageLayout( - dst, dst.length/getNumOutComponents(), - LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) | - LCMSImageLayout.BYTES_SH(1), getNumOutComponents());