/hg/release/icedtea6-1.13: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 14 12:17:26 UTC 2016
changeset 24ce0141709b in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=24ce0141709b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jun 14 07:56:05 2016 +0100
PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
2016-05-13 Andrew John Hughes <gnu.andrew at redhat.com>
PR2954: ecj/override.patch is missing new
@Overrides in RMIJRMPServerImpl.java
* NEWS: Updated.
* patches/ecj/override.patch:
Add cases in RMIJRMPServerImpl and others
which show up when source/target 5 is
used in the rt-class-files pre-build.
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch:
Remove addition of @Override.
changeset c1f3d7105545 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=c1f3d7105545
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jun 14 08:01:03 2016 +0100
S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6
2016-05-16 Andrew John Hughes <gnu.andrew at redhat.com>
S7050826, PR2956, RH1334465: Hebrew characters
are not rendered on OEL 5.6
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
Backport to allow Type 1 fonts to be used with
font configurations auto-generated by fontconfig.
changeset 2f2e32378389 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=2f2e32378389
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jun 14 08:05:43 2016 +0100
PR2961: Latest security update broke bundled LCMS2 build
2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
PR2961: Latest security update broke bundled
LCMS2 build
* NEWS:
Updated.
* patches/openjdk/lcms2/bundled/6523398-writing_tags.patch:
Regenerated.
changeset 30cfcde89678 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=30cfcde89678
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 18 19:05:31 2016 +0100
PR2962: System default check doesn't match all GNU/Linux systems
2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
PR2962: System default check doesn't match all
GNU/Linux systems
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Use a similar case statement
as in IT_SET_OS_DIRS to determine default based on OS.
(IT_CHECK_FOR_JPEG): Likewise.
(IT_CHECK_FOR_PNG): Likewise.
(IT_CHECK_FOR_GIF): Likewise.
changeset dcf569e8e778 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=dcf569e8e778
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue May 24 17:57:12 2016 +0100
PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set
2016-05-24 Andrew John Hughes <gnu.andrew at redhat.com>
PR2969: ENABLE_SYSTEM_LCMS is not defined
if ENABLE_LCMS2 is not set
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Set ENABLE_SYSTEM_LCMS
to no if ENABLE_LCMS2 is not set.
diffstat:
ChangeLog | 53 +++
Makefile.am | 3 +-
NEWS | 8 +
acinclude.m4 | 65 ++-
patches/ecj/override.patch | 237 ++++++++++++++
patches/openjdk/7050826-pr2956-allow_type1_fonts.patch | 31 +
patches/openjdk/8014205-blank_swing_dialogs_windows.patch | 3 +-
patches/openjdk/lcms2/bundled/6523398-writing_tags.patch | 143 ++++----
8 files changed, 446 insertions(+), 97 deletions(-)
diffs (truncated from 951 to 500 lines):
diff -r e54ba13945f0 -r dcf569e8e778 ChangeLog
--- a/ChangeLog Sun May 08 21:22:46 2016 +0100
+++ b/ChangeLog Tue May 24 17:57:12 2016 +0100
@@ -1,3 +1,56 @@
+2016-05-24 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2969: ENABLE_SYSTEM_LCMS is not defined
+ if ENABLE_LCMS2 is not set
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Set ENABLE_SYSTEM_LCMS
+ to no if ENABLE_LCMS2 is not set.
+
+2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2962: System default check doesn't match all
+ GNU/Linux systems
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Use a similar case statement
+ as in IT_SET_OS_DIRS to determine default based on OS.
+ (IT_CHECK_FOR_JPEG): Likewise.
+ (IT_CHECK_FOR_PNG): Likewise.
+ (IT_CHECK_FOR_GIF): Likewise.
+
+2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2961: Latest security update broke bundled
+ LCMS2 build
+ * NEWS:
+ Updated.
+ * patches/openjdk/lcms2/bundled/6523398-writing_tags.patch:
+ Regenerated.
+
+2016-05-16 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ S7050826, PR2956, RH1334465: Hebrew characters
+ are not rendered on OEL 5.6
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
+ Backport to allow Type 1 fonts to be used with
+ font configurations auto-generated by fontconfig.
+
+2016-05-13 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2954: ecj/override.patch is missing new
+ @Overrides in RMIJRMPServerImpl.java
+ * NEWS: Updated.
+ * patches/ecj/override.patch:
+ Add cases in RMIJRMPServerImpl and others
+ which show up when source/target 5 is
+ used in the rt-class-files pre-build.
+ * patches/openjdk/8014205-blank_swing_dialogs_windows.patch:
+ Remove addition of @Override.
+
2016-05-08 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.13.12 section.
diff -r e54ba13945f0 -r dcf569e8e778 Makefile.am
--- a/Makefile.am Sun May 08 21:22:46 2016 +0100
+++ b/Makefile.am Tue May 24 17:57:12 2016 +0100
@@ -626,7 +626,8 @@
patches/openjdk/8071705-pr2820-menu_misbehaviour.patch \
patches/openjdk/8150954-pr2868-composite_desktop.patch \
patches/pr2890-system_cacerts.patch \
- patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch
+ patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch \
+ patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r e54ba13945f0 -r dcf569e8e778 NEWS
--- a/NEWS Sun May 08 21:22:46 2016 +0100
+++ b/NEWS Tue May 24 17:57:12 2016 +0100
@@ -14,6 +14,14 @@
New in release 1.13.12 (2016-07-XX):
+* Backports
+ - S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6
+* Bug fixes
+ - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
+ - PR2961: Latest security update broke bundled LCMS2 build
+ - PR2962: System default check doesn't match all GNU/Linux systems
+ - PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set
+
New in release 1.13.11 (2016-05-05):
* Security fixes
diff -r e54ba13945f0 -r dcf569e8e778 acinclude.m4
--- a/acinclude.m4 Sun May 08 21:22:46 2016 +0100
+++ b/acinclude.m4 Tue May 24 17:57:12 2016 +0100
@@ -1566,10 +1566,17 @@
ENABLE_SYSTEM_LCMS="${enableval}"
],
[
- if test x"${ENABLE_LCMS2}" = "xyes" -a x"${target_os}" = "xlinux-gnu" ; then
- ENABLE_SYSTEM_LCMS="yes" ;
+ if test x"${ENABLE_LCMS2}" = "xyes" ; then
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_LCMS="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_LCMS="no" ;
+ ;;
+ esac
else
- ENABLE_SYSTEM_LCMS="no" ;
+ ENABLE_SYSTEM_LCMS="no"
fi;
])
AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
@@ -1596,11 +1603,14 @@
ENABLE_SYSTEM_ZLIB="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_ZLIB="yes" ;
- else
- ENABLE_SYSTEM_ZLIB="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_ZLIB="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_ZLIB="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_ZLIB})
if test x"${ENABLE_SYSTEM_ZLIB}" = "xyes"; then
@@ -1627,11 +1637,14 @@
ENABLE_SYSTEM_JPEG="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_JPEG="yes" ;
- else
- ENABLE_SYSTEM_JPEG="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_JPEG="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_JPEG="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_JPEG})
if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then
@@ -1656,11 +1669,14 @@
ENABLE_SYSTEM_PNG="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_PNG="yes" ;
- else
- ENABLE_SYSTEM_PNG="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_PNG="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_PNG="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_PNG})
if test x"${ENABLE_SYSTEM_PNG}" = "xyes"; then
@@ -1686,11 +1702,14 @@
ENABLE_SYSTEM_GIF="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_GIF="yes" ;
- else
- ENABLE_SYSTEM_GIF="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_GIF="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_GIF="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_GIF})
if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then
diff -r e54ba13945f0 -r dcf569e8e778 patches/ecj/override.patch
--- a/patches/ecj/override.patch Sun May 08 21:22:46 2016 +0100
+++ b/patches/ecj/override.patch Tue May 24 17:57:12 2016 +0100
@@ -362,3 +362,240 @@
public Class<?> run() {
try {
ReflectUtil.checkPackageAccess(className);
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Thu May 12 01:30:54 2016 +0100
+@@ -1870,7 +1870,6 @@
+
+ private ModifiableClassLoaderRepository getInstantiatorCLR() {
+ return AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
+- @Override
+ public ModifiableClassLoaderRepository run() {
+ return instantiator != null ? instantiator.getClassLoaderRepository() : null;
+ }
+diff -r 545db1dd8c2a src/share/classes/com/sun/media/sound/Platform.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Thu May 12 01:30:54 2016 +0100
+@@ -160,7 +160,6 @@
+ try {
+ // load the main library
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+- @Override
+ public Void run() {
+ System.loadLibrary(libNameMain);
+ return null;
+@@ -182,7 +181,6 @@
+ final String lib = st.nextToken();
+ try {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+- @Override
+ public Void run() {
+ System.loadLibrary(lib);
+ return null;
+diff -r 545db1dd8c2a src/share/classes/java/awt/EventQueue.java
+--- openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Thu May 12 01:30:54 2016 +0100
+@@ -190,7 +190,6 @@
+ EventQueue.invokeAndWait(source, r);
+ }
+
+- @Override
+ public long getMostRecentEventTime(EventQueue eventQueue) {
+ return eventQueue.getMostRecentEventTimeImpl();
+ }
+diff -r 545db1dd8c2a src/share/classes/java/io/ObjectInputStream.java
+--- openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Thu May 12 01:30:54 2016 +0100
+@@ -3571,7 +3571,6 @@
+ }
+ static {
+ SharedSecrets.setJavaObjectInputStreamAccess(new JavaObjectInputStreamAccess() {
+- @Override
+ public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
+ ObjectInputStream.setValidator(ois, validator);
+ }
+diff -r 545db1dd8c2a src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
+--- openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Thu May 12 01:30:54 2016 +0100
+@@ -64,7 +64,6 @@
+ final String propName = "sun.rmi.server.invocationhandler.allowFinalizeInvocation";
+ String allowProp = java.security.AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
+- @Override
+ public String run() {
+ return System.getProperty(propName);
+ }
+diff -r 545db1dd8c2a src/share/classes/sun/awt/image/SunVolatileImage.java
+--- openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Thu May 12 01:30:54 2016 +0100
+@@ -262,7 +262,6 @@
+ *
+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
+ */
+- @Override
+ public Surface getDestSurface() {
+ return volSurfaceManager.getPrimarySurfaceData();
+ }
+diff -r 545db1dd8c2a src/share/classes/sun/java2d/SunGraphics2D.java
+--- openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu May 12 01:30:54 2016 +0100
+@@ -3294,7 +3294,6 @@
+ *
+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
+ */
+- @Override
+ public Surface getDestSurface() {
+ return surfaceData;
+ }
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/server/UnicastServerRef.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Thu May 12 01:30:54 2016 +0100
+@@ -630,12 +630,10 @@
+ this.callID = callID;
+ }
+
+- @Override
+ public void validateDescriptor(ObjectStreamClass descriptor) {
+ descriptorCheck.check(method, descriptor, parameterIndex, callID);
+ }
+
+- @Override
+ public void checkProxyInterfaceNames(String[] ifaces) {
+ descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID);
+ }
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/Transport.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Thu May 12 01:30:54 2016 +0100
+@@ -133,7 +133,6 @@
+ */
+ private static void setContextClassLoader(final ClassLoader ccl) {
+ AccessController.doPrivileged(new PrivilegedAction<Void> () {
+- @Override
+ public Void run() {
+ Thread.currentThread().setContextClassLoader(ccl);
+ return null;
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Thu May 12 01:30:54 2016 +0100
+@@ -676,7 +676,6 @@
+ connectionCount.incrementAndGet() +
+ ")-" + remoteHost);
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+- @Override
+ public Void run() {
+ run0();
+ return null;
+diff -r 545db1dd8c2a src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+--- openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Thu May 12 01:30:54 2016 +0100
+@@ -92,7 +92,6 @@
+ return this;
+ }
+
+- @Override
+ public SurfaceData createManagedSurface(int w, int h, int transparency) {
+ return GLXSurfaceData.createData(this, w, h,
+ getColorModel(transparency),
+@@ -165,12 +164,10 @@
+ * Returns true if the provided capability bit is present for this config.
+ * See OGLContext.java for a list of supported capabilities.
+ */
+- @Override
+ public final boolean isCapPresent(int cap) {
+ return ((oglCaps.getCaps() & cap) != 0);
+ }
+
+- @Override
+ public final long getNativeConfigInfo() {
+ return pConfigInfo;
+ }
+@@ -180,7 +177,6 @@
+ *
+ * @see sun.java2d.pipe.hw.BufferedContextProvider#getContext
+ */
+- @Override
+ public final OGLContext getContext() {
+ return context;
+ }
+@@ -394,7 +390,6 @@
+ *
+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#createCompatibleVolatileImage
+ */
+- @Override
+ public VolatileImage
+ createCompatibleVolatileImage(int width, int height,
+ int transparency, int type)
+@@ -434,17 +429,14 @@
+ *
+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#getContextCapabilities
+ */
+- @Override
+ public ContextCapabilities getContextCapabilities() {
+ return oglCaps;
+ }
+
+- @Override
+ public void addDeviceEventListener(AccelDeviceEventListener l) {
+ AccelDeviceEventNotifier.addListener(l, screen.getScreen());
+ }
+
+- @Override
+ public void removeDeviceEventListener(AccelDeviceEventListener l) {
+ AccelDeviceEventNotifier.removeListener(l);
+ }
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Thu May 12 01:51:42 2016 +0100
+@@ -236,7 +236,6 @@
+ final MBeanInstantiator fInstantiator = instantiator;
+ this.secureClr = new
+ SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction<ClassLoaderRepository>() {
+- @Override
+ public ClassLoaderRepository run() {
+ return fInstantiator.getClassLoaderRepository();
+ }
+@@ -1257,7 +1256,6 @@
+ ClassLoader myLoader = outerShell.getClass().getClassLoader();
+ final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
+
+- @Override
+ public ModifiableClassLoaderRepository run() {
+ return instantiator.getClassLoaderRepository();
+ }
+diff -r b72e7b89dda9 src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
+--- openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu Sep 08 11:00:33 2011 -0700
++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu May 12 16:39:37 2016 +0100
+@@ -227,17 +227,14 @@
+ allowedTypes = credentialsTypes;
+ }
+
+- @Override
+ public String getVersion() throws RemoteException {
+ return impl.getVersion();
+ }
+
+- @Override
+ public RMIConnection newClient(Object credentials) throws IOException {
+ return impl.newClient(credentials);
+ }
+
+- @Override
+ public void check(Method method, ObjectStreamClass descriptor,
+ int paramIndex, int callID) {
+
+@@ -247,7 +244,6 @@
+ }
+ }
+
+- @Override
+ public void checkProxyClass(Method method, String[] ifaces,
+ int paramIndex, int callID) {
+ if (ifaces != null && ifaces.length > 0) {
+@@ -259,7 +255,6 @@
+ }
+ }
+
+- @Override
+ public void end(int callID) {
+ /* Do nothing */
+ }
diff -r e54ba13945f0 -r dcf569e8e778 patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7050826-pr2956-allow_type1_fonts.patch Tue May 24 17:57:12 2016 +0100
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User prr
+# Date 1315504833 25200
+# Thu Sep 08 11:00:33 2011 -0700
+# Node ID b72e7b89dda933e52d7cfd01baa7559c70be181a
+# Parent 545db1dd8c2a70c4cdb633b2e47457c4be051192
+7050826: Hebrew characters are not rendered on OEL 5.6
+Reviewed-by: bae, jgodinez
+
+diff -r 545db1dd8c2a -r b72e7b89dda9 src/solaris/native/sun/awt/fontpath.c
+--- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c Wed May 04 23:23:55 2016 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c Thu Sep 08 11:00:33 2011 -0700
+@@ -1259,8 +1259,16 @@
+
+ fontformat = NULL;
+ (*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
+- if (fontformat != NULL && strcmp((char*)fontformat, "TrueType")
+- != 0) {
++ /* We only want TrueType fonts but some Linuxes still depend
++ * on Type 1 fonts for some Locale support, so we'll allow
++ * them there.
++ */
++ if (fontformat != NULL
++ && (strcmp((char*)fontformat, "TrueType") != 0)
++#ifdef __linux__
++ && (strcmp((char*)fontformat, "Type 1") != 0)
++#endif
++ ) {
+ continue;
+ }
+ result = (*FcPatternGetCharSet)(fontPattern,
diff -r e54ba13945f0 -r dcf569e8e778 patches/openjdk/8014205-blank_swing_dialogs_windows.patch
--- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Sun May 08 21:22:46 2016 +0100
+++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Tue May 24 17:57:12 2016 +0100
@@ -116,7 +116,7 @@
{
if (numBands == 3 && !ccm.hasAlpha()) {
imageType = TYPE_3BYTE_BGR;
-@@ -804,6 +801,27 @@
+@@ -804,6 +801,26 @@
} // else if ((raster instanceof ByteComponentRaster) &&
}
@@ -129,7 +129,6 @@
+ new PrivilegedAction<Boolean>()
+ {
+
-+ @Override
+ public Boolean run() {
+ final ClassLoader std = System.class.getClassLoader();
+
diff -r e54ba13945f0 -r dcf569e8e778 patches/openjdk/lcms2/bundled/6523398-writing_tags.patch
--- a/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Sun May 08 21:22:46 2016 +0100
+++ b/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Tue May 24 17:57:12 2016 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-12-06 00:20:25.000000000 +0000
More information about the distro-pkg-dev
mailing list