/hg/icedtea6: New backports for issues to be fixed in 1.13.11.

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue May 3 22:29:15 UTC 2016


changeset 2c71794fd056 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2c71794fd056
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue May 03 23:29:05 2016 +0100

	New backports for issues to be fixed in 1.13.11.

	S6863746, PR2951: javap should not scan ct.sym by default
	S8071705, PR2820, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
	S8150954, PR2868, RH1176206: AWT Robot not compatible with GNOME Shell
	PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)

	2016-05-03  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patches.
		* NEWS: Updated.
		* patches/openjdk/6307603-xrender-01.patch:
		Regenerated after application of 8150954 / PR2868.
		* patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch,
		* patches/openjdk/8071705-pr2820-menu_misbehaviour.patch,
		* patches/openjdk/8150954-pr2868-composite_desktop.patch,
		* patches/pr2890-system_cacerts.patch:
		New backports for issues to be fixed in 1.13.11.


diffstat:

 ChangeLog                                               |   23 +
 INSTALL                                                 |    3 +-
 Makefile.am                                             |    6 +-
 NEWS                                                    |    4 +
 configure.ac                                            |   11 +-
 patches/openjdk/6307603-xrender-01.patch                |  190 ++++++------
 patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch |  111 +++++++
 patches/openjdk/8071705-pr2820-menu_misbehaviour.patch  |  234 ++++++++++++++++
 patches/openjdk/8150954-pr2868-composite_desktop.patch  |   79 +++++
 patches/pr2890-system_cacerts.patch                     |   39 ++
 10 files changed, 601 insertions(+), 99 deletions(-)

diffs (truncated from 1262 to 500 lines):

diff -r e9935e163815 -r 2c71794fd056 ChangeLog
--- a/ChangeLog	Mon Feb 15 17:48:40 2016 +0000
+++ b/ChangeLog	Tue May 03 23:29:05 2016 +0100
@@ -1,3 +1,26 @@
+2016-05-03  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* NEWS: Updated.
+	* patches/openjdk/6307603-xrender-01.patch:
+	Regenerated after application of 8150954 / PR2868.
+	* patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch,
+	* patches/openjdk/8071705-pr2820-menu_misbehaviour.patch,
+	* patches/openjdk/8150954-pr2868-composite_desktop.patch,
+	* patches/pr2890-system_cacerts.patch:
+	New backports for issues to be fixed in 1.13.11.
+
+2016-03-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	S8150954, PR2868, RH1176206: AWT Robot not
+	compatible with GNOME Shell
+	* INSTALL: Update X11 dependency documentation.
+	* configure.ac: Add check
+	for libXcomposite as required by fix
+	for PR2868. Correct variables used by
+	xproto check.
+
 2016-02-15  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR2849: wget not required when downloading is disabled
diff -r e9935e163815 -r 2c71794fd056 INSTALL
--- a/INSTALL	Mon Feb 15 17:48:40 2016 +0000
+++ b/INSTALL	Tue May 03 23:29:05 2016 +0100
@@ -12,7 +12,8 @@
   - IcedTea6
 Eclipse Java Compiler (ecj)
 CUPS
-libX11 (libXp, libXtst, libXi, libXt)
+libX11 (xproto, libX11, libXext, libXtst, libXi, libXt, libXinerama, libXcomposite, libXau, libXdmcp, libxcb)
+libXrender (for --enable-xrender)
 Freetype2
 patch
 sed
diff -r e9935e163815 -r 2c71794fd056 Makefile.am
--- a/Makefile.am	Mon Feb 15 17:48:40 2016 +0000
+++ b/Makefile.am	Tue May 03 23:29:05 2016 +0100
@@ -650,7 +650,11 @@
 	patches/openjdk/8140620-pr2711-find_default.sf2.patch \
 	patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch \
 	patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch \
-	patches/pr2808-fix_disabled_algorithms_test.patch
+	patches/pr2808-fix_disabled_algorithms_test.patch \
+	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
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r e9935e163815 -r 2c71794fd056 NEWS
--- a/NEWS	Mon Feb 15 17:48:40 2016 +0000
+++ b/NEWS	Tue May 03 23:29:05 2016 +0100
@@ -18,15 +18,19 @@
   - 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
+  - PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
 
 New in release 1.13.10 (2016-01-22):
 
diff -r e9935e163815 -r 2c71794fd056 configure.ac
--- a/configure.ac	Mon Feb 15 17:48:40 2016 +0000
+++ b/configure.ac	Tue May 03 23:29:05 2016 +0100
@@ -329,8 +329,8 @@
   AC_MSG_ERROR([Could not find Xproto headers - \
   Try installing xorg-x11-proto-devel.])
 fi
-AC_SUBST(XT_CFLAGS)
-AC_SUBST(XT_LIBS)
+AC_SUBST(XPROTO_CFLAGS)
+AC_SUBST(XPROTO_LIBS)
 
 dnl Check for libXt headers and libraries.
 PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no])
@@ -363,6 +363,13 @@
 AC_SUBST(XINERAMA_CFLAGS)
 AC_SUBST(XINERAMA_LIBS)
 
+PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [XCOMPOSITE_FOUND=yes], [XCOMPOSITE_FOUND=no])
+if test "x${XCOMPOSITE_FOUND}" = xno
+then AC_MSG_ERROR([Could not find Xcomposite extension.  Try installing libXcomposite-devel.])
+fi
+AC_SUBST(XCOMPOSITE_CFLAGS)
+AC_SUBST(XCOMPOSITE_LIBS)
+
 if test "x${ENABLE_XRENDER}" = "xyes"
 then
   PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no])
diff -r e9935e163815 -r 2c71794fd056 patches/openjdk/6307603-xrender-01.patch
--- a/patches/openjdk/6307603-xrender-01.patch	Mon Feb 15 17:48:40 2016 +0000
+++ b/patches/openjdk/6307603-xrender-01.patch	Tue May 03 23:29:05 2016 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers	2013-06-25 02:34:37.152677961 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers	2013-06-25 02:36:51.142787805 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers	2016-05-03 22:04:15.771333336 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers	2016-05-03 22:07:39.039957560 +0100
 @@ -312,6 +312,7 @@
                  Java_sun_awt_X11GraphicsEnvironment_initGLX;
  		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
@@ -71,8 +71,8 @@
                  Java_sun_java2d_opengl_OGLContext_getOGLIdString;
                  Java_sun_java2d_opengl_OGLMaskFill_maskFill;
 diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux	2013-06-25 02:34:37.324680663 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux	2016-05-03 22:04:15.915330941 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux	2016-05-03 22:07:39.039957560 +0100
 @@ -428,6 +428,7 @@
  		Java_sun_awt_X11GraphicsEnvironment_initDisplay;
  		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
@@ -82,8 +82,8 @@
          
  
 diff -Nru openjdk.orig/jdk/make/sun/headless/mapfile-vers openjdk/jdk/make/sun/headless/mapfile-vers
---- openjdk.orig/jdk/make/sun/headless/mapfile-vers	2013-06-25 02:34:35.284648623 +0100
-+++ openjdk/jdk/make/sun/headless/mapfile-vers	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/headless/mapfile-vers	2016-01-20 01:42:02.000000000 +0000
++++ openjdk/jdk/make/sun/headless/mapfile-vers	2016-05-03 22:07:39.039957560 +0100
 @@ -46,17 +46,20 @@
  		Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
  		Java_sun_java2d_x11_X11Renderer_devCopyArea;
@@ -112,8 +112,8 @@
  		Java_java_awt_Font_initIDs;
                  Java_sun_font_FontManager_getFontConfig;
 diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
---- openjdk.orig/jdk/make/sun/jawt/Makefile	2013-06-25 02:34:35.940658926 +0100
-+++ openjdk/jdk/make/sun/jawt/Makefile	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/jawt/Makefile	2016-05-03 22:04:15.187343047 +0100
++++ openjdk/jdk/make/sun/jawt/Makefile	2016-05-03 22:07:39.039957560 +0100
 @@ -118,7 +118,7 @@
  # Libraries to link in.
  #
@@ -124,8 +124,8 @@
  
  ifeq ($(PLATFORM), linux)
 diff -Nru openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk
---- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk	2013-06-25 02:34:35.536652580 +0100
-+++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk	2016-01-20 01:42:04.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk	2016-05-03 22:07:39.039957560 +0100
 @@ -79,4 +79,7 @@
  	gtk2_interface.c \
          swing_GTKEngine.c \
@@ -136,8 +136,8 @@
 +	XRBackendNative.c
 +
 diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
---- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-06-25 02:34:35.536652580 +0100
-+++ openjdk/jdk/make/sun/xawt/Makefile	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/xawt/Makefile	2016-05-03 22:04:18.839282315 +0100
++++ openjdk/jdk/make/sun/xawt/Makefile	2016-05-03 22:08:48.646803374 +0100
 @@ -48,6 +48,11 @@
  
  LDFLAGS += -L$(OPENWIN_LIB)
@@ -154,8 +154,8 @@
  vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/opengl
  vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/x11
  
--OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \
-+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \
+-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXcomposite -ldl \
++OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -lXcomposite -ldl \
                     $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
  
  ifeq  ($(PLATFORM), solaris)
@@ -169,8 +169,8 @@
  ifeq ($(PLATFORM), linux)
  # Allows for builds on Debian GNU Linux, X11 is in a different place 
 diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers
---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers	2013-06-25 02:34:38.056692161 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers	2016-05-03 22:04:16.323324156 +0100
++++ openjdk/jdk/make/sun/xawt/mapfile-vers	2016-05-03 22:07:39.039957560 +0100
 @@ -186,6 +186,7 @@
  	Java_sun_font_FontManager_populateFontFileNameMap;
          Java_sun_awt_X11GraphicsEnvironment_initDisplay;
@@ -242,7 +242,7 @@
          Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java
 --- openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java	2013-06-25 02:36:51.150787932 +0100
++++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java	2016-05-03 22:07:39.039957560 +0100
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -277,8 +277,8 @@
 +    public void glyphDisposed(ArrayList<Long> glyphs);
 +}
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java openjdk/jdk/src/share/classes/sun/font/StrikeCache.java
---- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java	2013-06-25 02:34:35.292648748 +0100
-+++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java	2016-01-20 01:42:30.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java	2016-05-03 22:07:39.039957560 +0100
 @@ -31,6 +31,7 @@
  import java.lang.ref.ReferenceQueue;
  import java.lang.ref.SoftReference;
@@ -440,8 +440,8 @@
      public static Reference getStrikeRef(FontStrike strike) {
          return getStrikeRef(strike, cacheRefTypeWeak);
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2011-11-14 22:12:00.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2016-01-20 01:42:02.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2016-05-03 22:07:39.043957494 +0100
 @@ -307,7 +307,7 @@
       * linear RGB space.  Copied directly from the
       * MultipleGradientPaintContext class.
@@ -452,8 +452,8 @@
  
          input = color / 255.0f;
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	2011-11-14 22:12:00.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	2016-01-20 01:42:03.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java	2016-05-03 22:07:39.043957494 +0100
 @@ -131,6 +131,11 @@
          curAddress = baseAddress;
      }
@@ -467,8 +467,8 @@
       * putByte() methods...
       */
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	2011-11-14 22:12:00.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	2016-01-20 01:42:04.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	2016-05-03 22:07:39.043957494 +0100
 @@ -1,2 +1,5 @@
 +# Jules Rendering Engine module
 +sun.java2d.jules.JulesRenderingEngine
@@ -478,8 +478,8 @@
 +sun.java2d.pisces.PiscesRenderingEngine
 \ No newline at end of file
 diff -Nru openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c
---- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c	2013-06-25 02:34:35.300648873 +0100
-+++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c	2013-06-25 02:36:51.150787932 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c	2016-01-20 01:42:39.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c	2016-05-03 22:07:39.043957494 +0100
 @@ -325,6 +325,7 @@
      cellInfo->glyphInfo = glyph;
      cellInfo->nextGCI = glyph->cellInfo;
@@ -489,8 +489,8 @@
  
  /**
 diff -Nru openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h
---- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h	2013-06-25 02:34:25.760499074 +0100
-+++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h	2013-06-25 02:36:51.154787995 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h	2016-01-20 01:42:39.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h	2016-05-03 22:07:39.043957494 +0100
 @@ -84,15 +84,26 @@
  
  #define t2kScalarAverage(a, b) (((a) + (b)) / (t2kScalar)(2))
@@ -520,9 +520,9 @@
  } GlyphInfo;
  
 diff -Nru openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c openjdk/jdk/src/share/native/sun/font/freetypeScaler.c
---- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	2013-06-25 02:34:36.620669606 +0100
-+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	2013-06-25 02:36:51.154787995 +0100
-@@ -783,6 +783,7 @@
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	2016-05-03 22:04:18.659285307 +0100
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	2016-05-03 22:07:39.043957494 +0100
+@@ -752,6 +752,7 @@
          return ptr_to_jlong(glyphInfo);
      }
      glyphInfo->cellInfo  = NULL;
@@ -530,7 +530,7 @@
      glyphInfo->rowBytes  = width;
      glyphInfo->width     = width;
      glyphInfo->height    = height;
-@@ -1131,7 +1132,7 @@
+@@ -1101,7 +1102,7 @@
                      current_type = SEG_LINETO;
                  }
              } else if (FT_CURVE_TAG(outline->tags[i]) == FT_CURVE_TAG_CUBIC) {
@@ -540,8 +540,8 @@
                     point; and a second-order control point if unset.  */
                  current_type = SEG_CUBICTO;
 diff -Nru openjdk.orig/jdk/src/share/native/sun/font/sunFont.c openjdk/jdk/src/share/native/sun/font/sunFont.c
---- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c	2013-06-25 02:34:35.300648873 +0100
-+++ openjdk/jdk/src/share/native/sun/font/sunFont.c	2013-06-25 02:36:51.154787995 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c	2016-01-20 01:42:40.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/sunFont.c	2016-05-03 22:07:39.043957494 +0100
 @@ -294,7 +294,8 @@
          for (i=0; i< len; i++) {
              if (ptrs[i] != 0) {
@@ -572,8 +572,8 @@
  }
  
 diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	2011-11-14 22:12:13.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	2013-06-25 02:36:51.154787995 +0100
+--- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	2016-01-20 01:42:42.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	2016-05-03 22:07:39.043957494 +0100
 @@ -244,6 +244,7 @@
  OGLTR_AddToGlyphCache(GlyphInfo *glyph, jboolean rgbOrder)
  {
@@ -616,17 +616,17 @@
  
      // location of the glyph in the destination's coordinate space
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	2013-06-25 02:34:35.304648936 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	2013-06-25 02:36:51.154787995 +0100
-@@ -37,6 +37,7 @@
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	2016-01-20 01:42:43.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	2016-05-03 22:08:08.207473921 +0100
+@@ -39,6 +39,7 @@
  import java.util.HashMap;
  
  import sun.java2d.opengl.GLXGraphicsConfig;
 +import sun.java2d.xr.XRGraphicsConfig;
  import sun.java2d.loops.SurfaceType;
  
- /**
-@@ -150,6 +151,8 @@
+ import sun.misc.ThreadGroupUtils;
+@@ -154,6 +155,8 @@
              }
  
              boolean glxSupported = X11GraphicsEnvironment.isGLXAvailable();
@@ -635,7 +635,7 @@
              boolean dbeSupported = isDBESupported();
              if (dbeSupported && doubleBufferVisuals == null) {
                  doubleBufferVisuals = new HashSet();
-@@ -165,9 +168,16 @@
+@@ -169,9 +172,16 @@
                      boolean doubleBuffer =
                          (dbeSupported &&
                           doubleBufferVisuals.contains(new Integer(visNum)));
@@ -655,7 +655,7 @@
                  }
              }
              configs = ret;
-@@ -241,9 +251,19 @@
+@@ -245,9 +255,19 @@
                      doubleBuffer =
                          doubleBufferVisuals.contains(new Integer(visNum));
                  }
@@ -679,8 +679,8 @@
          }
      }
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	2013-06-25 02:34:35.368649941 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	2013-06-25 02:36:51.154787995 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	2016-01-20 01:42:43.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	2016-05-03 22:07:39.043957494 +0100
 @@ -26,6 +26,7 @@
  package sun.awt;
  
@@ -765,7 +765,7 @@
       * Returns:
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,206 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -975,7 +975,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,301 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1280,7 +1280,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,152 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1436,7 +1436,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,109 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1549,7 +1549,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,349 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1902,7 +1902,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,271 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2177,7 +2177,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2235,7 +2235,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java	2013-06-25 02:36:51.154787995 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,102 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2341,7 +2341,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java	2013-06-25 02:36:51.158788059 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,67 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2412,7 +2412,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java	2013-06-25 02:36:51.158788059 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,146 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2562,7 +2562,7 @@
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java	2013-06-25 02:36:51.158788059 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,110 @@
 +/*
 + * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
@@ -2675,8 +2675,8 @@
 +    }
 +}
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java
---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java	2011-11-14 22:12:15.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java	2013-06-25 02:36:51.158788059 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java	2016-01-20 01:42:44.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java	2016-05-03 22:07:39.043957494 +0100
 @@ -34,6 +34,8 @@
  import sun.java2d.opengl.GLXGraphicsConfig;
  import sun.java2d.opengl.GLXVolatileSurfaceManager;
@@ -2705,8 +2705,8 @@
              return new X11VolatileSurfaceManager(vImg, context);
          }
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	2013-06-25 02:34:37.168678213 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	2013-06-25 02:36:51.158788059 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	2016-05-03 22:04:15.787333069 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java	2016-05-03 22:07:39.043957494 +0100
 @@ -46,6 +46,7 @@
  import sun.awt.SunToolkit;
  import sun.awt.X11ComponentPeer;
@@ -2797,7 +2797,7 @@
      private Region validatedClip;
 diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java
 --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java	2013-06-25 02:36:51.158788059 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java	2016-05-03 22:07:39.043957494 +0100
 @@ -0,0 +1,40 @@
 +package sun.java2d.x11;
 +


More information about the distro-pkg-dev mailing list