changeset in /hg/icedtea: Bump to b43.
Andrew John Hughes
gnu_andrew at member.fsf.org
Sun Jan 18 18:29:54 PST 2009
changeset bdb64f82284d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bdb64f82284d
description:
Bump to b43.
2009-01-18 Andrew John Hughes <gnu_andrew at member.fsf.org>
Bump to b43.
* patches/icedtea-6761856-freetypescaler.patch,
* patches/icedtea-display-mode-changer.patch:
Removed, applied in b43.
* ChangeLog: Fix date on last entry.
* HACKING: Updated list of ecj patches and removed
dropped patches for IcedTea7.
* Makefile.am: Remove dropped patches, add new one.
* patches/ecj/icedtea-sbcs.patch: New patch to prevent
GenerateSBCS.java using java.util.Scanner for ecj builds.
* patches/xrender/icedtea-002.patch: Recreated against b43.
diffstat:
7 files changed, 1436 insertions(+), 1572 deletions(-)
ChangeLog | 16
HACKING | 16
Makefile.am | 11
patches/ecj/icedtea-sbcs.patch | 38
patches/icedtea-6761856-freetypescaler.patch | 47
patches/icedtea-display-mode-changer.patch | 100
patches/xrender/icedtea-002.patch | 2780 ++++++++++++--------------
diffs (truncated from 4064 to 500 lines):
diff -r b5fe6c65b574 -r bdb64f82284d ChangeLog
--- a/ChangeLog Sun Dec 21 05:05:35 2008 +0000
+++ b/ChangeLog Mon Jan 19 02:29:32 2009 +0000
@@ -1,4 +1,18 @@ 2008-12-20 Andrew John Hughes <gnu_and
-2008-12-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-18 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ Bump to b43.
+ * patches/icedtea-6761856-freetypescaler.patch,
+ * patches/icedtea-display-mode-changer.patch:
+ Removed, applied in b43.
+ * ChangeLog: Fix date on last entry.
+ * HACKING: Updated list of ecj patches and removed
+ dropped patches for IcedTea7.
+ * Makefile.am: Remove dropped patches, add new one.
+ * patches/ecj/icedtea-sbcs.patch: New patch to prevent
+ GenerateSBCS.java using java.util.Scanner for ecj builds.
+ * patches/xrender/icedtea-002.patch: Recreated against b43.
+
+2008-12-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Fix b42 tarball name and checksum
due to reroll.
diff -r b5fe6c65b574 -r bdb64f82284d HACKING
--- a/HACKING Sun Dec 21 05:05:35 2008 +0000
+++ b/HACKING Mon Jan 19 02:29:32 2009 +0000
@@ -71,9 +71,6 @@ The following patches are currently appl
* icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
* icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
-* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
- #6761856, swing TextLayout.getBounds() returns shifted bounds.
-* icedtea-display-mode-changer.patch: Add extra test class.
* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
@@ -83,6 +80,7 @@ The following patches are only applied t
The following patches are only applied to OpenJDK6 in IcedTea6:
* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
+* icedtea-display-mode-changer.patch: Add extra test class. (applied in OpenJDK7 b43)
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-generated.patch: Force use of /bin/bash.
* icedtea-nomotif.patch: Remove sanity and GrabShell.h dependency on Motif/Lesstif library.
@@ -92,6 +90,8 @@ The following patches are only applied t
* icedtea-lucene-crash.patch: Fix lucene bad code generation bug #6707044.
* icedtea-6700047-loopopts.patch: Fix partial peeling issue, bug #6700047.
* icedtea-6712835-ifnode.patch: Fix infinite loop in PhaseIterGVN::transform.
+* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
+ #6761856, swing TextLayout.getBounds() returns shifted bounds (applied in OpenJDK7 b43).
* icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943).
* icedtea-version.patch: Fix (langtools) ant build to honor fcs MILESTONE setting (S6778493).
@@ -111,13 +111,19 @@ The following patches are only applied t
The following patches are only applied to the icedtea-ecj bootstrap tree:
-* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
+* ecj/icedtea.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
calls, replace hexadecimal floating point literals with decimal variants in
java.lang.Double and java.lang.Float.
-* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261)
+* ecj/icedtea-jopt.patch: Disable -J options to jar when unsupported.
+* ecj/icedtea-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261)
+* ecj/icedtea-spp.patch: Fixes Spp.java to not use java.util.Scanner.
+
+The following patches are only applied to the icedtea-ecj bootstrap tree in IcedTea:
+
+* ecj/icedtea-sbcs.patch: Fixes GenerateSBCS.java to not use java.util.Scanner.
The following patches are only applied for IcedTea builds using the zero-assembler:
diff -r b5fe6c65b574 -r bdb64f82284d Makefile.am
--- a/Makefile.am Sun Dec 21 05:05:35 2008 +0000
+++ b/Makefile.am Mon Jan 19 02:29:32 2009 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 19_dec_2008
-OPENJDK_DATE = 19_dec_2008
-OPENJDK_MD5SUM = 89eb28aaa3e89e9350f15e5e4b718a40
-OPENJDK_VERSION = b42
+OPENJDK_DATE = 15_jan_2009
+OPENJDK_MD5SUM = 71d680eab0a8e82ba6a76f66322ff2ab
+OPENJDK_VERSION = b43
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -1870,8 +1870,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-linker-libs-order.patch \
patches/icedtea-f2i-overflow.patch \
patches/icedtea-cc-interp-no-fer.patch \
- patches/icedtea-6761856-freetypescaler.patch \
- patches/icedtea-display-mode-changer.patch \
patches/icedtea-testenv.patch \
patches/icedtea-format-warnings.patch \
patches/icedtea-fortify-source.patch \
@@ -2198,7 +2196,8 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte
patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
patches/ecj/icedtea-spp.patch \
patches/ecj/icedtea-jopt.patch \
- patches/ecj/icedtea-pr261.patch
+ patches/ecj/icedtea-pr261.patch \
+ patches/ecj/icedtea-sbcs.patch
stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
mkdir -p stamps; \
diff -r b5fe6c65b574 -r bdb64f82284d patches/ecj/icedtea-sbcs.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-sbcs.patch Mon Jan 19 02:29:32 2009 +0000
@@ -0,0 +1,38 @@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-01-18 03:30:42.000000000 +0000
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-01-19 00:55:58.000000000 +0000
+@@ -27,7 +27,6 @@
+
+ import java.io.*;
+ import java.util.ArrayList;
+-import java.util.Scanner;
+ import java.util.Formatter;
+ import java.util.regex.*;
+ import java.nio.charset.*;
+@@ -40,9 +39,8 @@
+ System.exit(1);
+ }
+
+- Scanner s = new Scanner(new File(args[0], args[2]));
+- while (s.hasNextLine()) {
+- String line = s.nextLine();
++ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2])));
++ for (String line = s.readLine(); line != null; line = s.readLine()) {
+ if (line.startsWith("#") || line.length() == 0)
+ continue;
+ String[] fields = line.split("\\s+");
+@@ -201,12 +199,10 @@
+ int c2blen)
+ throws Exception
+ {
+- Scanner s = new Scanner(new File(srcDir, template));
++ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
+ PrintStream out = new PrintStream(new FileOutputStream(
+ new File(dstDir, clzName + ".java")));
+-
+- while (s.hasNextLine()) {
+- String line = s.nextLine();
++ for (String line = s.readLine(); line != null; line = s.readLine()) {
+ int i = line.indexOf("$");
+ if (i == -1) {
+ out.println(line);
diff -r b5fe6c65b574 -r bdb64f82284d patches/icedtea-6761856-freetypescaler.patch
--- a/patches/icedtea-6761856-freetypescaler.patch Sun Dec 21 05:05:35 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-# User igor
-# Date 1225234342 -10800
-# Node ID 9cdababf6179bd03270d881740fbb5dcc405854f
-# Parent 594c52582b21063bdbc36b38d9f73a3c46abe041
-6761856: OpenJDK: vertical text metrics may be significanly different from those returned by Sun JDK
-Reviewed-by: bae, prr
-
---- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c Tue Oct 28 14:47:14 2008 -0700
-+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c Wed Oct 29 01:52:22 2008 +0300
-@@ -1281,7 +1281,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
- sunFontIDs.rect2DFloatClass,
- sunFontIDs.rect2DFloatCtr4,
- F26Dot6ToFloat(bbox.xMin),
-- F26Dot6ToFloat(bbox.yMax),
-+ F26Dot6ToFloat(-bbox.yMax),
- F26Dot6ToFloat(bbox.xMax-bbox.xMin),
- F26Dot6ToFloat(bbox.yMax-bbox.yMin));
- }
---- openjdk.orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java Tue Oct 28 14:47:14 2008 -0700
-+++ openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java Wed Oct 29 01:52:22 2008 +0300
-@@ -22,7 +22,7 @@
- */
- /* @test
- * @summary verify TextLayout.getBounds() return visual bounds
-- * @bug 6323611
-+ * @bug 6323611 6761856
- */
-
- import java.awt.*;
-@@ -39,10 +39,15 @@ public class TextLayoutBounds {
- Rectangle2D tlBounds = tl.getBounds();
- GlyphVector gv = f.createGlyphVector(frc, s);
- Rectangle2D gvvBounds = gv.getVisualBounds();
-+ Rectangle2D oBounds = tl.getOutline(null).getBounds2D();
- System.out.println("tlbounds="+tlBounds);
- System.out.println("gvbounds="+gvvBounds);
-+ System.out.println("outlineBounds="+oBounds);
- if (!gvvBounds.equals(tlBounds)) {
-- throw new RuntimeException("Bounds differ");
-+ throw new RuntimeException("Bounds differ [gvv != tl]");
-+ }
-+ if (!tlBounds.equals(oBounds)) {
-+ throw new RuntimeException("Bounds differ [tl != outline]");
- }
- }
- }
-
diff -r b5fe6c65b574 -r bdb64f82284d patches/icedtea-display-mode-changer.patch
--- a/patches/icedtea-display-mode-changer.patch Sun Dec 21 05:05:35 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-6733718: test /java/awt/FullScreen/UninitializedDisplayModeChangeTest/ fails
-Reviewed-by: igor
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java Tue Aug 05 09:37:03 2008 -0700
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+import java.awt.DisplayMode;
-+import java.awt.EventQueue;
-+import java.awt.Frame;
-+import java.awt.GraphicsDevice;
-+import java.awt.GraphicsEnvironment;
-+import java.lang.reflect.InvocationTargetException;
-+
-+/**
-+ * Used by the UninitializedDisplayModeChangeTest to change the
-+ * display mode.
-+ */
-+public class DisplayModeChanger {
-+
-+ public static void main(String[] args)
-+ throws InterruptedException, InvocationTargetException
-+ {
-+ final GraphicsDevice gd =
-+ GraphicsEnvironment.getLocalGraphicsEnvironment().
-+ getDefaultScreenDevice();
-+
-+ EventQueue.invokeAndWait(new Runnable() {
-+ public void run() {
-+ Frame f = null;
-+ if (gd.isFullScreenSupported()) {
-+ try {
-+ f = new Frame("DisplayChanger Frame");
-+ gd.setFullScreenWindow(f);
-+ if (gd.isDisplayChangeSupported()) {
-+ DisplayMode dm = findDisplayMode(gd);
-+ if (gd != null) {
-+ gd.setDisplayMode(dm);
-+ }
-+ }
-+ try {
-+ Thread.sleep(1000);
-+ } catch (InterruptedException ex) {
-+ ex.printStackTrace();
-+ }
-+ gd.setFullScreenWindow(null);
-+ } finally {
-+ if (f != null) {
-+ f.dispose();
-+ }
-+ }
-+ }
-+ }
-+ });
-+ }
-+
-+ /**
-+ * Finds a display mode that is different from the current display
-+ * mode and is likely to cause a display change event.
-+ */
-+ private static DisplayMode findDisplayMode(GraphicsDevice gd) {
-+ DisplayMode dms[] = gd.getDisplayModes();
-+ DisplayMode currentDM = gd.getDisplayMode();
-+ for (DisplayMode dm : dms) {
-+ if (!dm.equals(currentDM) &&
-+ dm.getRefreshRate() == currentDM.getRefreshRate())
-+ {
-+ // different from the current dm and refresh rate is the same
-+ // means that something else is different => more likely to
-+ // cause a DM change event
-+ return dm;
-+ }
-+ }
-+ return null;
-+ }
-+
-+}
-
diff -r b5fe6c65b574 -r bdb64f82284d patches/xrender/icedtea-002.patch
--- a/patches/xrender/icedtea-002.patch Sun Dec 21 05:05:35 2008 +0000
+++ b/patches/xrender/icedtea-002.patch Mon Jan 19 02:29:32 2009 +0000
@@ -1,13 +1,6 @@
-# HG changeset patch
-# User ceisserer
-# Date 1217623431 -7200
-# Node ID 4b11af86e814b7d62e9e1e19788d527987bb209c
-# Parent 6d294fa2bd421e3c8978730855d7300af692b271
-Summary: Comments, bug fixes, initial solaris work
-
-diff -r 6d294fa2bd42 -r 4b11af86e814 make/sun/xawt/Makefile
---- openjdk/jdk/make/sun/xawt/Makefile Sat Jul 26 00:13:41 2008 +0200
-+++ openjdk/jdk/make/sun/xawt/Makefile Fri Aug 01 22:43:51 2008 +0200
+diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-18 01:30:31.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-18 01:47:11.000000000 +0000
@@ -86,7 +86,7 @@
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
@@ -17,10 +10,10 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 mak
$(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
ifeq ($(PLATFORM), solaris)
-diff -r 6d294fa2bd42 -r 4b11af86e814 make/sun/xawt/mapfile-vers
---- openjdk/jdk/make/sun/xawt/mapfile-vers Sat Jul 26 00:13:41 2008 +0200
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers Fri Aug 01 22:43:51 2008 +0200
-@@ -314,6 +314,15 @@
+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 2009-01-18 01:30:31.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:48:17.000000000 +0000
+@@ -316,6 +316,13 @@
Java_sun_java2d_opengl_GLXSurfaceData_initOps;
Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer;
@@ -29,21 +22,15 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 mak
+ Java_sun_java2d_x11_XSurfaceData_XResetClip;
+ Java_sun_java2d_x11_XSurfaceData_XSetClip;
+ Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
-+ Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
-+ Java_sun_java2d_x11_XSurfaceData_setInvalid;
+ Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
+
Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
-@@ -331,20 +340,12 @@
- Java_sun_java2d_x11_X11Renderer_XFillRect;
- Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
- Java_sun_java2d_x11_X11Renderer_devCopyArea;
-- Java_sun_java2d_x11_X11SurfaceData_setInvalid;
- Java_sun_java2d_x11_X11SurfaceData_initIDs;
-- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid;
+@@ -338,16 +345,10 @@
+ Java_sun_java2d_x11_X11SurfaceData_isDrawableValid;
Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable;
+ Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
- Java_sun_java2d_x11_X11SurfaceData_initOps;
Java_sun_java2d_x11_X11SurfaceData_initSurface;
- Java_sun_java2d_x11_X11SurfaceData_flushNativeSurface;
@@ -57,9 +44,9 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 mak
Java_sun_java2d_xr_XRSurfaceData_flushNativeSurface;
Java_sun_java2d_xr_XRSurfaceData_XRIsDrawableValid;
-diff -r 6d294fa2bd42 -r 4b11af86e814 src/solaris/classes/sun/font/XRTextRenderer.java
---- openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java Sat Jul 26 00:13:41 2008 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java Fri Aug 01 22:43:51 2008 +0200
+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 2009-01-18 01:30:31.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2009-01-18 01:47:11.000000000 +0000
@@ -25,7 +25,7 @@
package sun.font;
@@ -109,10 +96,10 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
+ }
+ }
}
-diff -r 6d294fa2bd42 -r 4b11af86e814 src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
---- openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java Sat Jul 26 00:13:41 2008 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java Fri Aug 01 22:43:51 2008 +0200
-@@ -60,7 +60,7 @@
+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 2009-01-18 01:30:31.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-01-18 01:47:11.000000000 +0000
+@@ -61,7 +61,7 @@
import sun.java2d.pipe.TextPipe;
import sun.java2d.pipe.Region;
@@ -121,7 +108,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
X11ComponentPeer peer;
X11GraphicsConfig graphicsConfig;
private RenderLoops solidloops;
-@@ -70,8 +70,6 @@
+@@ -71,8 +71,6 @@
private static native void initIDs(Class xorComp, boolean tryDGA); //OK
protected native void initSurface(int depth, int width, int height,
long drawable);
@@ -130,7 +117,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
public static final String
DESC_INT_BGR_X11 = "Integer BGR Pixmap";
-@@ -405,12 +403,6 @@
+@@ -420,12 +418,6 @@
cm, drawable, transparency);
}
@@ -143,7 +130,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
protected X11SurfaceData(X11ComponentPeer peer,
X11GraphicsConfig gc,
SurfaceType sType,
-@@ -568,8 +560,6 @@
+@@ -583,8 +575,6 @@
return sType;
}
@@ -152,7 +139,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
public void invalidate() {
if (isValid()) {
setInvalid();
-@@ -581,18 +571,10 @@
+@@ -596,18 +586,10 @@
* The following methods and variables are used to keep the Java-level
* context state in sync with the native X11 GC associated with this
* X11SurfaceData object.
@@ -172,9 +159,9 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
private long xgc;
private Region validatedClip;
-diff -r 6d294fa2bd42 -r 4b11af86e814 src/solaris/classes/sun/java2d/x11/XSurfaceData.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java Fri Aug 01 22:43:51 2008 +0200
+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 2009-01-18 01:47:11.000000000 +0000
@@ -0,0 +1,35 @@
+package sun.java2d.x11;
+
@@ -211,9 +198,9 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
+ protected static native void XSetGraphicsExposures(long xgc,
+ boolean needExposures);
+}
-diff -r 6d294fa2bd42 -r 4b11af86e814 src/solaris/classes/sun/java2d/xr/XRDrawImage.java
---- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java Sat Jul 26 00:13:41 2008 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java Fri Aug 01 22:43:51 2008 +0200
+diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2009-01-18 01:30:31.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2009-01-18 01:47:11.000000000 +0000
@@ -7,44 +7,36 @@
import sun.java2d.loops.*;
import sun.java2d.pipe.*;
@@ -233,12 +220,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
- sg.TRANSFORM_GENERIC,
- sg.imageComp,
- bgColor);
-+ AffineTransform tx, int interpType, int sx1, int sy1, int sx2,
-+ int sy2, Color bgColor) {
-+ SurfaceData dstData = sg.surfaceData;
-+ SurfaceData srcData = dstData.getSourceSurfaceData(img,
-+ SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor);
-
+-
- if (srcData != null && !isBgOperation(srcData, bgColor) && srcData instanceof XRSurfaceData)
- {
- SurfaceType srcType = srcData.getSurfaceType();
@@ -249,11 +231,7 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
- TransformBlit blit = TransformBlit.getFromCache(srcType,
- sg.imageComp,
- dstType);
-+ if (srcData != null && !isBgOperation(srcData, bgColor)
-+ && srcData instanceof XRSurfaceData) {
-+ SurfaceType srcType = srcData.getSurfaceType();
-+ SurfaceType dstType = dstData.getSurfaceType();
-
+-
- if (blit != null) {
- blit.Transform(srcData, dstData,
- sg.composite, sg.getCompClip(),
@@ -263,10 +241,20 @@ diff -r 6d294fa2bd42 -r 4b11af86e814 src
- }
-
- }
++ AffineTransform tx, int interpType, int sx1, int sy1, int sx2,
++ int sy2, Color bgColor) {
++ SurfaceData dstData = sg.surfaceData;
++ SurfaceData srcData = dstData.getSourceSurfaceData(img,
++ SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor);
++
++ if (srcData != null && !isBgOperation(srcData, bgColor)
++ && srcData instanceof XRSurfaceData) {
++ SurfaceType srcType = srcData.getSurfaceType();
++ SurfaceType dstType = dstData.getSurfaceType();
++
+ ((XRSurfaceData) srcData).setPreferredInterpolation(XRUtils
+ .ATransOpToXRQuality(interpType));
-
-- super.renderImageXform(sg, img, tx, interpType, sx1, sy1, sx2, sy2, bgColor);
More information about the distro-pkg-dev
mailing list