# HG changeset patch # User Andrew John Hughes # Date 1464118113 -3600 # Node ID 193acb643c5f8d28717347366fc2701283999a3e # Parent c07937132d4e7f57dd8efd0c1c005f4e5288a786# Parent cc7089689313beeabdc290ab5b833fec896cb7e7 Merge diff -r c07937132d4e -r 193acb643c5f ChangeLog --- a/ChangeLog Sun May 08 21:12:46 2016 +0100 +++ b/ChangeLog Tue May 24 20:28:33 2016 +0100 @@ -1,3 +1,83 @@ +2016-05-24 Andrew John Hughes + + 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 + + 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 + + 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 + + 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 + + PR2957: Build bootstrap code (rt-class-files.stamp) + using bootstrap flags (source/target 1.5) + * Makefile.am: + (IT_BOOT_LANGUAGE_SOURCE_VERSION): Introduce + and set to 5. + (IT_BOOT_CLASS_TARGET_VERSION): Likewise. + (IT_BOOT_JAVACFLAGS): Same as IT_JAVACFLAGS + but using IT_BOOT_CLASS_TARGET_VERSION and + IT_BOOT_LANGUAGE_SOURCE_VERSION. + (rt-class-files): Use IT_BOOT_JAVACFLAGS. + * NEWS: Updated. + +2016-05-13 Andrew John Hughes + + 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 + + * NEWS: Add 1.13.11 release notes. + +2016-05-03 Andrew John Hughes + + PR2953: make dist fails after PR2887 made + jstaptest.pl auto-generated + * Makefile.am: + (TAPSET_TEST_SRCS): Remove jstaptest.pl which + is now auto-generated and handled by autotools. + * NEWS: Updated. + 2016-05-08 Andrew John Hughes * Makefile.am: diff -r c07937132d4e -r 193acb643c5f Makefile.am --- a/Makefile.am Sun May 08 21:12:46 2016 +0100 +++ b/Makefile.am Tue May 24 20:28:33 2016 +0100 @@ -169,6 +169,9 @@ IT_LANGUAGE_SOURCE_VERSION=6 IT_CLASS_TARGET_VERSION=6 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) +IT_BOOT_LANGUAGE_SOURCE_VERSION=5 +IT_BOOT_CLASS_TARGET_VERSION=5 +IT_BOOT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_BOOT_LANGUAGE_SOURCE_VERSION) -target $(IT_BOOT_CLASS_TARGET_VERSION) # Conditional defintions @@ -270,7 +273,6 @@ $(top_srcdir)/test/tapset/JNITestClass.c \ $(top_srcdir)/test/tapset/JNITestClass.h \ $(top_srcdir)/test/tapset/JNITestClass.java \ - $(top_srcdir)/test/tapset/jstaptest.pl \ $(top_srcdir)/test/tapset/RunWrapper.java \ $(top_srcdir)/test/tapset/StapJNIClassLoader.java \ $(top_srcdir)/test/tapset/StapURLClassLoader.java \ @@ -638,7 +640,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 += \ @@ -2858,7 +2861,7 @@ if BOOTSTRAPPING mkdir -p lib/rt if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \ - $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \ + $(BOOT_DIR)/bin/javac $(IT_BOOT_JAVACFLAGS) -d lib/rt \ -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ -sourcepath $(SOURCEPATH_DIRS) \ -bootclasspath \'\' @rt-source-files.txt ; \ diff -r c07937132d4e -r 193acb643c5f NEWS --- a/NEWS Sun May 08 21:12:46 2016 +0100 +++ b/NEWS Tue May 24 20:28:33 2016 +0100 @@ -14,6 +14,28 @@ New in release 1.14.0 (201X-XX-XX): +* Backports + - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init + - S6727719: Performance of TextLayout.getBounds() + - S6745225: Memory leak while drawing Attributed String + - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. + - S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6 + - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages + - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() + - S8026887: Make issues due to failed large pages allocations easier to debug + - S8076221, PR2808: Disable RC4 cipher suites +* Bug fixes + - PR1886: IcedTea does not checksum supplied tarballs + - PR2083: Add support for building Zero on AArch64 + - PR2849: wget not required when downloading is disabled + - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java + - PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5) + - 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 - S8129952, CVE-2016-0686: Ensure thread consistency - S8132051, CVE-2016-0687: Better byte behavior @@ -77,24 +99,14 @@ - S8155699: Resolve issues created by backports in OpenJDK 6 b39 - S8155746: Sync Windows export list in make/java/jli/Makefile with make/java/jli/mapfile-vers * Backports - - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init - - S6727719: Performance of TextLayout.getBounds() - - S6745225: Memory leak while drawing Attributed String - S6863746, PR2951: javap should not scan ct.sym by default - - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. - - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() - - S8026887: Make issues due to failed large pages allocations easier to debug - S8071705, PR2820, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically - - S8076221, PR2808: Disable RC4 cipher suites - S8150954, PR2868, RH1176206: AWT Robot not compatible with GNOME Shell * Bug fixes - - PR1886: IcedTea does not checksum supplied tarballs - - PR2083: Add support for building Zero on AArch64 - - PR2849: wget not required when downloading is disabled - PR2887: Location of 'stap' executable is hard-coded - PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) - PR2952: test/tapset/jstaptest.pl requires Perl + - PR2953: make dist fails after PR2887 made jstaptest.pl auto-generated New in release 1.13.10 (2016-01-22): diff -r c07937132d4e -r 193acb643c5f acinclude.m4 --- a/acinclude.m4 Sun May 08 21:12:46 2016 +0100 +++ b/acinclude.m4 Tue May 24 20:28:33 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 c07937132d4e -r 193acb643c5f patches/ecj/override.patch --- a/patches/ecj/override.patch Sun May 08 21:12:46 2016 +0100 +++ b/patches/ecj/override.patch Tue May 24 20:28:33 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() { +- @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() { +- @Override + public Void run() { + System.loadLibrary(libNameMain); + return null; +@@ -182,7 +181,6 @@ + final String lib = st.nextToken(); + try { + AccessController.doPrivileged(new PrivilegedAction() { +- @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() { +- @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 () { +- @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() { +- @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() { +- @Override + public ClassLoaderRepository run() { + return fInstantiator.getClassLoaderRepository(); + } +@@ -1257,7 +1256,6 @@ + ClassLoader myLoader = outerShell.getClass().getClassLoader(); + final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction() { + +- @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 c07937132d4e -r 193acb643c5f 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 20:28:33 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 c07937132d4e -r 193acb643c5f patches/openjdk/8014205-blank_swing_dialogs_windows.patch --- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Sun May 08 21:12:46 2016 +0100 +++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Tue May 24 20:28:33 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() + { + -+ @Override + public Boolean run() { + final ClassLoader std = System.class.getClassLoader(); + diff -r c07937132d4e -r 193acb643c5f patches/openjdk/lcms2/bundled/6523398-writing_tags.patch --- a/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Sun May 08 21:12:46 2016 +0100 +++ b/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Tue May 24 20:28:33 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 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-12-19 12:12:15.815239068 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2016-05-18 03:56:07.430737147 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -401,7 +401,7 @@ } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2013-12-06 00:20:25.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2016-05-03 23:38:49.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,750 +0,0 @@ -/* @@ -1155,8 +1155,8 @@ - -} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-12-19 12:12:15.819239130 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2016-05-03 23:59:14.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2016-05-18 03:59:35.483319782 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -2920,11 +2920,11 @@ + cmsHANDLE hIT8; + cmsIT8* it8; + int type; -+ + +- int type = IsMyBlock((LPBYTE) Ptr, len); + _cmsAssert(Ptr != NULL); + _cmsAssert(len != 0); - -- int type = IsMyBlock((LPBYTE) Ptr, len); ++ + type = IsMyBlock((cmsUInt8Number*)Ptr, len); if (type == 0) return NULL; @@ -2967,10 +2967,10 @@ + cmsHANDLE hIT8; + cmsIT8* it8; + int type; ++ ++ _cmsAssert(cFileName != NULL); - int type = IsMyFile(cFileName); -+ _cmsAssert(cFileName != NULL); -+ + type = IsMyFile(cFileName); if (type == 0) return NULL; @@ -3013,9 +3013,9 @@ - LPTABLE t = GetTable(it8); + cmsIT8* it8 = (cmsIT8*) hIT8; + TABLE* t; -+ + + _cmsAssert(hIT8 != NULL); - ++ + t = GetTable(it8); + + if (SampleNames) @@ -3101,7 +3101,7 @@ return i; } } -@@ -2459,62 +2390,65 @@ +@@ -2459,63 +2390,66 @@ static @@ -3140,11 +3140,12 @@ for (i=0; i < t->nSamples; i++) { fld = GetDataFormat(it8, i); -- if (stricmp(fld, cSample) == 0) -+ if (cmsstrcasecmp(fld, cSample) == 0) - return i; - } - + if (fld != NULL) { +- if (stricmp(fld, cSample) == 0) ++ if (cmsstrcasecmp(fld, cSample) == 0) + return i; + } + } - - // SynError(it8, "Couldn't find data field %s\n", cSample); return -1; @@ -3182,7 +3183,7 @@ { const char* Buffer; -@@ -2530,19 +2464,23 @@ +@@ -2531,19 +2465,23 @@ } @@ -3210,7 +3211,7 @@ sprintf(Buff, it8->DoubleFormatter, Val); return SetData(it8, row, col, Buff); -@@ -2550,18 +2488,18 @@ +@@ -2551,18 +2489,18 @@ @@ -3232,7 +3233,7 @@ iSet = LocatePatch(it8, cPatch); if (iSet < 0) { return NULL; -@@ -2571,7 +2509,7 @@ +@@ -2572,7 +2510,7 @@ } @@ -3241,7 +3242,7 @@ { const char* Buffer; -@@ -2589,100 +2527,109 @@ +@@ -2590,100 +2528,109 @@ @@ -3398,7 +3399,7 @@ if (cField != NULL && *cField == 0) cField = "LABEL"; -@@ -2700,18 +2647,21 @@ +@@ -2701,18 +2648,21 @@ if (ExpectedType) { @@ -3424,7 +3425,7 @@ if(pos == -1) return FALSE; -@@ -2720,9 +2670,11 @@ +@@ -2721,9 +2671,11 @@ } @@ -3439,8 +3440,8 @@ if (Formatter == NULL) strcpy(it8->DoubleFormatter, DEFAULT_DBL_FORMAT); diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-12-19 12:12:15.819239130 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2016-05-18 03:56:07.430737147 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -4889,8 +4890,8 @@ +} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-12-19 12:12:15.819239130 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2016-05-18 03:56:07.434737081 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -5357,8 +5358,8 @@ +} + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-12-19 12:12:15.819239130 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2016-05-18 03:56:07.434737081 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -7159,8 +7160,8 @@ } + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-12-19 12:12:15.819239130 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2016-05-18 03:56:07.434737081 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -8784,8 +8785,8 @@ + return TRUE; } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-12-19 12:12:15.823239190 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2016-05-18 03:56:07.434737081 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -10848,8 +10849,8 @@ -#undef DENS - diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-12-19 12:12:15.823239190 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2016-05-18 03:56:07.438737016 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -12897,8 +12898,8 @@ + return TRUE; +} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-12-19 12:12:15.823239190 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2016-05-18 03:56:07.438737016 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -17088,8 +17089,8 @@ } - diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-12-19 12:12:15.827239250 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2016-05-18 03:56:07.442736950 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -19209,7 +19210,7 @@ - - diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2013-12-06 00:20:25.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2016-05-03 23:38:49.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,411 +0,0 @@ -/* @@ -19625,7 +19626,7 @@ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2013-12-19 12:12:15.835239368 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2016-05-18 03:56:07.442736950 +0100 @@ -0,0 +1,346 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -19974,8 +19975,8 @@ +} + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2013-12-19 12:12:15.827239250 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2016-05-18 03:56:07.442736950 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -20860,8 +20861,8 @@ - - diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-12-19 12:12:15.827239250 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2016-05-18 03:56:07.446736885 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -21683,7 +21684,7 @@ + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2013-12-19 12:12:15.835239368 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2016-05-18 03:56:07.446736885 +0100 @@ -0,0 +1,1657 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -23343,8 +23344,8 @@ +} + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-12-19 12:12:15.827239250 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2016-05-18 03:56:07.450736818 +0100 @@ -27,8 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -27383,8 +27384,8 @@ + return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans); } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-12-19 12:12:15.831239308 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2016-05-18 03:56:07.450736818 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -28582,7 +28583,7 @@ +} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2013-12-19 12:12:15.835239368 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2016-05-18 03:56:07.450736818 +0100 @@ -0,0 +1,641 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29226,8 +29227,8 @@ + PluginPool = NULL; +} diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-12-19 12:12:15.831239308 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2016-05-18 03:56:07.450736818 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -31123,8 +31124,8 @@ + } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-12-19 12:12:15.831239308 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2016-05-18 03:56:07.450736818 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -31955,7 +31956,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 2013-12-19 12:12:15.835239368 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 2016-05-18 03:56:07.450736818 +0100 @@ -0,0 +1,762 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32721,7 +32722,7 @@ +#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2013-12-19 12:12:15.839239428 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2016-05-18 03:56:07.454736753 +0100 @@ -0,0 +1,4863 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37587,8 +37588,8 @@ +} + diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2013-12-19 12:20:16.982448126 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2016-05-18 03:56:07.454736753 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -38676,7 +38677,7 @@ { cmsCIExyY D65; cmsCIExyYTRIPLE Rec709Primaries = { -@@ -744,38 +655,44 @@ +@@ -744,38 +656,44 @@ {0.3000, 0.6000, 1.0}, {0.1500, 0.0600, 1.0} }; @@ -38735,7 +38736,7 @@ { cmsCIELab LabIn, LabOut; cmsCIELCh LChIn, LChOut; -@@ -813,116 +730,438 @@ +@@ -813,116 +731,438 @@ // Creates an abstract profile operating in Lab space for Brightness, // contrast, Saturation and white point displacement @@ -39227,8 +39228,8 @@ + return NULL; } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2013-12-19 12:12:15.831239308 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2016-05-18 03:56:07.458736687 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -40028,8 +40029,8 @@ + return TRUE; } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2013-12-06 00:20:25.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2013-12-19 12:12:15.835239368 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2016-05-03 23:38:49.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2016-05-18 03:56:07.458736687 +0100 @@ -27,9 +27,10 @@ // However, the following notice accompanied the original version of this // file: @@ -42569,7 +42570,7 @@ + return xform -> ContextID; } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h 2013-12-06 00:20:25.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h 2016-05-03 23:38:49.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,1023 +0,0 @@ -/* @@ -43597,7 +43598,7 @@ -#endif /* ICC_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2013-12-19 12:12:15.843239488 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2016-05-18 03:56:07.462736622 +0100 @@ -0,0 +1,1751 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45352,7 +45353,7 @@ +#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2013-12-19 12:12:15.843239488 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2016-05-18 03:56:07.462736622 +0100 @@ -0,0 +1,678 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46034,7 +46035,7 @@ +#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h --- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h 2013-12-19 12:12:15.843239488 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h 2016-05-18 03:56:07.462736622 +0100 @@ -0,0 +1,562 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46599,7 +46600,7 @@ +#define _lcms_plugin_H +#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h ---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2013-12-06 00:20:25.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2016-05-03 23:38:49.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,2099 +0,0 @@ -/*