Mercurial > hg > release > icedtea7-2.6
changeset 3007:4c823521f1da
PR3761: OpenJDK 7.241 doesn't compile
2019-11-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3761: OpenJDK 7.241 doesn't compile
* Makefile.am:
(ICEDTEA_PATCHES): Add local copy of patch,
which will be removed when we upgrade to upstream 7u251.
* NEWS: Updated.
* patches/8232643-pr3761.patch: Fix missing type
parameter in sun.nio.cs.ext.DoubleByteDecoder.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 15 Nov 2019 04:38:01 +0000 |
| parents | 7befa259c1f2 |
| children | 182c7f2e776e |
| files | ChangeLog Makefile.am NEWS patches/8232643-pr3761.patch |
| diffstat | 4 files changed, 37 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Nov 14 02:36:21 2019 +0000 +++ b/ChangeLog Fri Nov 15 04:38:01 2019 +0000 @@ -1,3 +1,13 @@ +2019-11-14 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3761: OpenJDK 7.241 doesn't compile + * Makefile.am: + (ICEDTEA_PATCHES): Add local copy of patch, + which will be removed when we upgrade to upstream 7u251. + * NEWS: Updated. + * patches/8232643-pr3761.patch: Fix missing type + parameter in sun.nio.cs.ext.DoubleByteDecoder. + 2019-11-13 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to 2.6.20.
--- a/Makefile.am Thu Nov 14 02:36:21 2019 +0000 +++ b/Makefile.am Fri Nov 15 04:38:01 2019 +0000 @@ -369,7 +369,7 @@ # Patch list -ICEDTEA_PATCHES = +ICEDTEA_PATCHES = patches/8232643-pr3761.patch # Conditional patches
--- a/NEWS Thu Nov 14 02:36:21 2019 +0000 +++ b/NEWS Fri Nov 15 04:38:01 2019 +0000 @@ -53,6 +53,8 @@ - S8041129: [OGL] surface->sw blit is extremely slow - S8216965: crash in freetypeScaler.c CopyBW2Grey8 - S8226318: Class Loader Dependencies improvements +* Bug fixes + - PR3761: OpenJDK 7.241 doesn't compile New in release 2.6.19 (2019-07-17):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/8232643-pr3761.patch Fri Nov 15 04:38:01 2019 +0000 @@ -0,0 +1,24 @@ +# HG changeset patch +# User mbalao +# Date 1571433044 10800 +# Fri Oct 18 18:10:44 2019 -0300 +# Node ID 55de33c12fdcff9cc3fa391e9343a04d398c48e5 +# Parent ce5e37056409870413d49cce681049b711220849 +8232643: Building error in jdk7u241 after 7068616 +Reviewed-by: andrew + +diff --git openjdk.orig/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java openjdk/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java +--- openjdk.orig/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java ++++ openjdk/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java +@@ -209,9 +209,9 @@ + if (bugLevel == null) { + if (!sun.misc.VM.isBooted()) + return false; +- java.security.PrivilegedAction pa = ++ java.security.PrivilegedAction<String> pa = + new GetPropertyAction("sun.nio.cs.bugLevel"); +- String value = (String)AccessController.doPrivileged(pa); ++ String value = AccessController.doPrivileged(pa); + bugLevel = (value != null) ? value : ""; + } + return bugLevel.equals(bl);