/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jun 2 12:26:32 PDT 2010
changeset e39b0fad0de1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e39b0fad0de1
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Mar 16 10:29:49 2010 -0400
Added support for JSObject.finalize()
2010-03-16 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
(newMessageOnBus): Added support for finalize. (finalize):
New function. Decrements object reference count by one.
(queue_processor): Added support for finalize.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused
function declerations. Added decleration for finalize.
changeset 9f29f7bf45c5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f29f7bf45c5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 02 15:42:29 2010 +0100
NetX/plugin build sync (3/3): Remove binary plug import.
2010-03-16 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (3/3):
* patches/icedtea-copy-plugs.patch: Remove plug-related
segments and move remainder to patches/boot/getannotation-
cast.patch.
* Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add
javax/management/StandardMBean.java. (ICEDTEA_PATCHES):
Remove copy-plugs.patch. (BOOTCLASSPATH_RT_LIBGCJ): Remove
duplication of including system rt.jar as well.
(ICEDTEA_BOOT_PATCHES): Add getannotation-cast.patch.
(clean-local): Don't depend on clean-plugs. (.PHONY):
Likewise. (icedtea-debug.stamp): Remove liveconnect-
dist.stamp as implied by plugin.stamp. (icedtea-
boot.stamp): Likewise and add plugin.stamp. (clean-rt):
Revert to system rt.jar. (bootstrap/jdk1.7.0/jre/lib/rt-
closed.jar): Removed. (plugs.stamp): Removed.
(clean-plugs): Removed.
* patches/boot/getannotation-cast.patch: Remaining part of
copy-plugs.patch which provides a cast for getAnnotation for
older versions of GNU Classpath.
changeset 19818bda1c63 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=19818bda1c63
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 02 19:36:23 2010 +0100
Remove @Override hack.
2010-06-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (IT_LANGUAGE_SOURCE_VERSION): Bump to
6 to support @Override. (IT_CLASS_TARGET_VERSION):
Likewise. (extract-openjdk.stamp): Remove @Override hack.
* patches/xrender/icedtea-001.patch: Recreated.
diffstat:
7 files changed, 186 insertions(+), 157 deletions(-)
ChangeLog | 44 ++++++++
Makefile.am | 49 +++------
patches/boot/getannotation-cast.patch | 12 ++
patches/icedtea-copy-plugs.patch | 60 -----------
patches/xrender/icedtea-001.patch | 112 ++++++++++-----------
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 56 ++++++++++
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 10 -
diffs (truncated from 759 to 500 lines):
diff -r 8a1a5c294219 -r 19818bda1c63 ChangeLog
--- a/ChangeLog Tue Jun 01 22:35:00 2010 +0100
+++ b/ChangeLog Wed Jun 02 19:36:23 2010 +0100
@@ -1,3 +1,47 @@ 2010-03-15 Andrew John Hughes <ahughes
+2010-06-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (IT_LANGUAGE_SOURCE_VERSION): Bump to 6
+ to support @Override.
+ (IT_CLASS_TARGET_VERSION): Likewise.
+ (extract-openjdk.stamp): Remove @Override hack.
+ * patches/xrender/icedtea-001.patch:
+ Recreated.
+
+2010-03-16 Andrew John Hughes <ahughes at redhat.com>
+
+ NetX/plugin build sync (3/3):
+ * patches/icedtea-copy-plugs.patch:
+ Remove plug-related segments and move
+ remainder to patches/boot/getannotation-cast.patch.
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add javax/management/StandardMBean.java.
+ (ICEDTEA_PATCHES): Remove copy-plugs.patch.
+ (BOOTCLASSPATH_RT_LIBGCJ): Remove duplication of including system rt.jar as well.
+ (ICEDTEA_BOOT_PATCHES): Add getannotation-cast.patch.
+ (clean-local): Don't depend on clean-plugs.
+ (.PHONY): Likewise.
+ (icedtea-debug.stamp): Remove liveconnect-dist.stamp as
+ implied by plugin.stamp.
+ (icedtea-boot.stamp): Likewise and add plugin.stamp.
+ (clean-rt): Revert to system rt.jar.
+ (bootstrap/jdk1.7.0/jre/lib/rt-closed.jar): Removed.
+ (plugs.stamp): Removed.
+ (clean-plugs): Removed.
+ * patches/boot/getannotation-cast.patch:
+ Remaining part of copy-plugs.patch which
+ provides a cast for getAnnotation for older versions
+ of GNU Classpath.
+
+2010-03-16 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (newMessageOnBus): Added support for finalize.
+ (finalize): New function. Decrements object reference count by one.
+ (queue_processor): Added support for finalize.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused
+ function declerations. Added decleration for finalize.
+
2010-03-15 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (2/3):
diff -r 8a1a5c294219 -r 19818bda1c63 Makefile.am
--- a/Makefile.am Tue Jun 01 22:35:00 2010 +0100
+++ b/Makefile.am Wed Jun 02 19:36:23 2010 +0100
@@ -136,15 +136,18 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \
ICEDTEA_BOOTSTRAP_RESOURCES = \
$(LANGTOOLS)/com/sun/tools/javac/resources
+# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
+# PR43389 - javax.management.StandardMBean
ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
+ $(SHARE)/javax/management/StandardMBean.java
endif
# Settings for javac
-IT_LANGUAGE_SOURCE_VERSION=5
-IT_CLASS_TARGET_VERSION=5
+IT_LANGUAGE_SOURCE_VERSION=6
+IT_CLASS_TARGET_VERSION=6
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
@@ -265,7 +268,6 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
# Patch list
ICEDTEA_PATCHES = \
- patches/icedtea-copy-plugs.patch \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
patches/icedtea-ssl.patch \
patches/icedtea-rmi_amd64.patch \
@@ -412,7 +414,8 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant-
patches/boot/icedtea-jopt.patch \
patches/boot/icedtea-dyn.patch \
patches/boot/icedtea-jaxp-dependency.patch \
- patches/boot/genstubs-nofork.patch
+ patches/boot/genstubs-nofork.patch \
+ patches/boot/getannotation-cast.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
@@ -559,7 +562,7 @@ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT):$(ICEDTEA_RT)" \
BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT)" \
- BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT):$(SYSTEM_JDK_DIR)/jre/lib/rt.jar" \
+ BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT)" \
GENSRCDIR="$(abs_top_builddir)/generated" \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
@@ -754,7 +757,7 @@ check-local: jtregcheck
clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
- clean-plugs clean-extra clean-netx clean-visualvm clean-nbplatform \
+ clean-extra clean-netx clean-visualvm clean-nbplatform \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \
@@ -780,7 +783,7 @@ install:
clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
- clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \
+ clean-icedtea icedtea-stage2 clean-icedtea-boot \
clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \
hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \
clean-drops
@@ -1289,8 +1292,6 @@ endif
fi
chmod -R ug+w openjdk
sh $(srcdir)/fsg.sh ;
- find openjdk -name '*.java' \
- -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \
mkdir -p stamps
touch $@
@@ -1876,8 +1877,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect-dist.stamp $(PULSE_JAVA_TARGET) \
- stamps/rewrite-rhino.stamp
+ stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1985,9 +1985,8 @@ clean-icedtea-debug-stage2:
# ===================
stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
- stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/plugs.stamp \
- stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/cacao.stamp \
- stamps/rewrite-rhino.stamp
+ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/netx-dist.stamp \
+ stamps/plugin.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot \
@@ -2703,21 +2702,9 @@ clean-rt:
rm -rf lib/rt
rm -f stamps/rt-class-files.stamp stamps/rt.stamp
rm -f rt-source-files.txt
-
-# rt-closed.jar.
-bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt.stamp
- mkdir -p bootstrap/jdk1.7.0/jre/lib
- ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-
-stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
- mkdir -p stamps
- touch $@
-
-clean-plugs: clean-rt
- rm -f stamps/plugs.stamp
- rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
- rm -rf bootstrap/jdk1.7.0
+ if [ -e bootstrap/boot/jre/lib ] ; then
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib
+ fi
# Target Aliases
# ===============
@@ -2804,8 +2791,6 @@ plugin: stamps/plugin.stamp
plugin-tests: stamps/plugin-tests.stamp
-plugs: stamps/plugs.stamp
-
pulse-java: $(PULSE_JAVA_TARGET)
rewriter: stamps/rewriter.stamp
diff -r 8a1a5c294219 -r 19818bda1c63 patches/boot/getannotation-cast.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/getannotation-cast.patch Wed Jun 02 19:36:23 2010 +0100
@@ -0,0 +1,12 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 02:25:40.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 15:45:15.000000000 +0000
+@@ -1475,7 +1475,7 @@
+ }
+
+ private static String[] getAnnotationValue(Constructor<?> constructor) {
+- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+ return (annotation != null)
+ ? annotation.value()
+ : null;
diff -r 8a1a5c294219 -r 19818bda1c63 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Tue Jun 01 22:35:00 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-05 08:44:12.000000000 +0000
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-10 15:49:40.000000000 +0000
-@@ -93,11 +93,32 @@
- @for i in $(PLUG_JMF_CLASS_NAMES) ; do \
- $(ECHO) "$$i" >> $@; \
- done
-+$(PLUG_TEMPDIR)/gnu.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_GNU_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
-+$(PLUG_TEMPDIR)/javax.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_JAVAX_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
-+$(PLUG_TEMPDIR)/netx.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_NETX_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
- $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
- @$(prep-target)
- $(CAT) $(PLUG_CLISTS) > $@
- $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
- $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
-+ $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/javax.jargs: $(PLUG_TEMPDIR)/javax.clist
-+ $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/netx.jargs: $(PLUG_TEMPDIR)/netx.clist
-+ $(plug-create-jargs)
- $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
- $(plug-create-jargs)
-
-@@ -122,9 +143,9 @@
- # Import classes command
-
- define import-binary-plug-classes
--@$(MKDIR) -p $(CLASSDESTDIR)
-+$(MKDIR) -p $(CLASSDESTDIR)
- @$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
--($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) )
-+($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) `$(CAT) $1`)
- ($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
- endef # import-binary-plug-classes
-
-diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 02:25:40.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 15:45:15.000000000 +0000
-@@ -1475,7 +1475,7 @@
- }
-
- private static String[] getAnnotationValue(Constructor<?> constructor) {
-- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
- return (annotation != null)
- ? annotation.value()
- : null;
diff -r 8a1a5c294219 -r 19818bda1c63 patches/xrender/icedtea-001.patch
--- a/patches/xrender/icedtea-001.patch Tue Jun 01 22:35:00 2010 +0100
+++ b/patches/xrender/icedtea-001.patch Wed Jun 02 19:36:23 2010 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/sun/font
diff -Nru openjdk.orig/jdk/make/sun/font/FILES_c.gmk openjdk/jdk/make/sun/font/FILES_c.gmk
---- openjdk.orig/jdk/make/sun/font/FILES_c.gmk 2009-06-30 14:05:45.000000000 +0100
-+++ openjdk/jdk/make/sun/font/FILES_c.gmk 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/make/sun/font/FILES_c.gmk 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/font/FILES_c.gmk 2010-06-02 19:03:05.000000000 +0100
@@ -115,6 +115,7 @@
FILES_cpp_platform =
else
@@ -10,9 +10,9 @@ diff -Nru openjdk.orig/jdk/make/sun/font
FILES_cpp_platform =
endif
diff -Nru openjdk.orig/jdk/make/sun/font/Makefile openjdk/jdk/make/sun/font/Makefile
---- openjdk.orig/jdk/make/sun/font/Makefile 2009-10-21 19:24:47.000000000 +0100
-+++ openjdk/jdk/make/sun/font/Makefile 2009-10-23 14:35:23.000000000 +0100
-@@ -86,6 +86,7 @@
+--- openjdk.orig/jdk/make/sun/font/Makefile 2010-06-02 18:53:13.000000000 +0100
++++ openjdk/jdk/make/sun/font/Makefile 2010-06-02 19:03:05.000000000 +0100
+@@ -87,6 +87,7 @@
sun/font/NativeStrike.java \
sun/font/NativeStrikeDisposer.java \
sun/font/X11TextRenderer.java \
@@ -21,8 +21,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font
endif # PLATFORM
diff -Nru openjdk.orig/jdk/make/sun/font/mapfile-vers openjdk/jdk/make/sun/font/mapfile-vers
---- openjdk.orig/jdk/make/sun/font/mapfile-vers 2009-10-21 16:42:03.000000000 +0100
-+++ openjdk/jdk/make/sun/font/mapfile-vers 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/make/sun/font/mapfile-vers 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/font/mapfile-vers 2010-06-02 19:03:05.000000000 +0100
@@ -56,6 +56,7 @@
Java_sun_font_NativeFont_getGlyphImage;
Java_sun_font_NativeFont_getGlyphImageNoDefault;
@@ -32,8 +32,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font
*;
};
diff -Nru openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk openjdk/jdk/make/sun/font/mapfile-vers.openjdk
---- openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk 2009-10-21 16:42:03.000000000 +0100
-+++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2010-06-02 19:03:05.000000000 +0100
@@ -75,6 +75,7 @@
Java_sun_font_FreetypeFontScaler_getUnitsPerEMNative;
Java_sun_font_FreetypeFontScaler_initNativeScaler;
@@ -43,8 +43,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font
*;
};
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 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-06-02 19:03:05.000000000 +0100
@@ -79,4 +79,11 @@
gtk2_interface.c \
swing_GTKEngine.c \
@@ -59,9 +59,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
+ XRRenderer.c \
+ XRPMBlitLoops.c
diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
---- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/Makefile 2009-10-23 14:35:23.000000000 +0100
-@@ -87,7 +87,7 @@
+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/xawt/Makefile 2010-06-02 19:03:05.000000000 +0100
+@@ -88,7 +88,7 @@
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
@@ -71,9 +71,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
ifeq ($(PLATFORM), solaris)
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-10-21 16:42:03.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-10-23 14:35:23.000000000 +0100
-@@ -367,6 +367,33 @@
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-06-02 19:03:05.000000000 +0100
+@@ -370,6 +370,33 @@
Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
Java_sun_java2d_x11_X11SurfaceData_XSetGraphicsExposures;
@@ -108,8 +108,8 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
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 2009-10-21 19:23:52.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-06-02 19:03:05.000000000 +0100
@@ -307,7 +307,7 @@
* linear RGB space. Copied directly from the
* MultipleGradientPaintContext class.
@@ -120,8 +120,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
input = color / 255.0f;
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 2009-10-21 19:24:08.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-06-02 19:03:05.000000000 +0100
@@ -37,6 +37,7 @@
import java.util.HashMap;
@@ -185,8 +185,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
}
}
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 2009-10-21 19:24:08.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-10-23 14:36:10.000000000 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-06-02 19:03:05.000000000 +0100
@@ -47,9 +47,9 @@
import sun.font.Font2D;
import sun.font.FontManager;
@@ -265,7 +265,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
* Checks if Shared Memory extension can be used.
* Returns:
@@ -397,4 +432,14 @@
-
+ @Override
public void paletteChanged() {
}
+
@@ -281,7 +281,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
}
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 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
@@ -337,8 +337,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+ }
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java
---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2009-10-21 19:24:09.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2010-06-02 19:03:05.000000000 +0100
@@ -33,6 +33,7 @@
import sun.java2d.opengl.GLXGraphicsConfig;
import sun.java2d.opengl.GLXVolatileSurfaceManager;
@@ -365,8 +365,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
}
}
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-10-21 19:24:09.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-10-23 14:35:23.000000000 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-06-02 19:03:05.000000000 +0100
@@ -42,10 +42,7 @@
import java.awt.image.Raster;
import java.awt.peer.ComponentPeer;
@@ -417,7 +417,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
/**
* Returns true if we can use DGA on any of the screens
*/
-@@ -661,7 +668,7 @@
+@@ -664,7 +671,7 @@
{
// assert SunToolkit.isAWTLockHeldByCurrentThread();
@@ -428,7 +428,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
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 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,50 @@
+package sun.java2d.xr;
+
@@ -482,7 +482,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * To change this template, choose Tools | Templates
@@ -528,7 +528,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,71 @@
+package sun.java2d.xr;
+
@@ -603,7 +603,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,75 @@
+package sun.java2d.xr;
+
@@ -682,7 +682,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -893,7 +893,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
\ No newline at end of file
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,255 @@
+package sun.java2d.xr;
+
@@ -1152,7 +1152,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2009-10-23 14:35:23.000000000 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2010-06-02 19:03:05.000000000 +0100
@@ -0,0 +1,1017 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -2173,7 +2173,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 2009-10-23 14:35:23.000000000 +0100
More information about the distro-pkg-dev
mailing list