/hg/icedtea: Bump to b74.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 27 18:05:32 PDT 2009
changeset 1a7fa6604936 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1a7fa6604936
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 28 01:09:18 2009 +0000
Bump to b74.
2009-10-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Bump to b74.
* patches/boot/icedtea.patch,
* patches/xrender/icedtea-001.patch,
* patches/xrender/icedtea-003.patch,
* patches/xrender/icedtea-004.patch,
* patches/xrender/icedtea-005.patch,
* patches/xrender/icedtea-007.patch: Recreated.
diffstat:
8 files changed, 307 insertions(+), 307 deletions(-)
ChangeLog | 11 +
Makefile.am | 34 ++---
patches/boot/icedtea.patch | 128 ++++++++++-----------
patches/xrender/icedtea-001.patch | 161 +++++++++++++-------------
patches/xrender/icedtea-003.patch | 20 +--
patches/xrender/icedtea-004.patch | 24 ++--
patches/xrender/icedtea-005.patch | 15 --
patches/xrender/icedtea-007.patch | 221 ++++++++++++++++++-------------------
diffs (truncated from 1437 to 500 lines):
diff -r 05e6f20fb7fd -r 1a7fa6604936 ChangeLog
--- a/ChangeLog Wed Oct 14 02:18:26 2009 +0100
+++ b/ChangeLog Wed Oct 28 01:09:18 2009 +0000
@@ -1,3 +1,14 @@ 2009-10-08 Andrew John Hughes <ahughes
+2009-10-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Bump to b74.
+ * patches/boot/icedtea.patch,
+ * patches/xrender/icedtea-001.patch,
+ * patches/xrender/icedtea-003.patch,
+ * patches/xrender/icedtea-004.patch,
+ * patches/xrender/icedtea-005.patch,
+ * patches/xrender/icedtea-007.patch:
+ Recreated.
+
2009-10-08 Andrew John Hughes <ahughes at redhat.com>
* ChangeLog: Remove stray tab.
diff -r 05e6f20fb7fd -r 1a7fa6604936 Makefile.am
--- a/Makefile.am Wed Oct 14 02:18:26 2009 +0100
+++ b/Makefile.am Wed Oct 28 01:09:18 2009 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b73
-
-CORBA_CHANGESET = bb1f254d2376
-HOTSPOT_CHANGESET = de2100353d9c
-JAXP_CHANGESET = ca47845adba8
-JAXWS_CHANGESET = a85341f84531
-JDK_CHANGESET = 93da8a843f32
-LANGTOOLS_CHANGESET = 26651c0cabb7
-OPENJDK_CHANGESET = a580d2beece9
-
-CORBA_MD5SUM = 80e4f10ff90ecd80b32a39dbe6f7fa77
-HOTSPOT_MD5SUM = efc9ee49fe1f10f9a6db2ec897e76937
-JAXP_MD5SUM = d2aa8cd7aaeeabfb9116f020921fb7ea
-JAXWS_MD5SUM = 0fa8f01a5baa8764106370321fdb3974
-JDK_MD5SUM = f127c5785e84443f869fb1695f786749
-LANGTOOLS_MD5SUM = 3b5f8641e805b22562452924d0bf4ea5
-OPENJDK_MD5SUM = 17bc02e01cfdb06ee06f01026e93b0a2
+OPENJDK_VERSION = b74
+
+CORBA_CHANGESET = ddc6504bb4f3
+HOTSPOT_CHANGESET = 4aad6284518e
+JAXP_CHANGESET = 1da2b57e4825
+JAXWS_CHANGESET = b176d7a1d9e9
+JDK_CHANGESET = 6d6f38ba8a03
+LANGTOOLS_CHANGESET = 27f109855e7f
+OPENJDK_CHANGESET = f8e6c40ffac8
+
+CORBA_MD5SUM = 1e931327890c8951d98e27bdfb54021b
+HOTSPOT_MD5SUM = 99e631c28819d643cbf1dcca0d3f4a99
+JAXP_MD5SUM = f1bef1d655513d450e0a57db6bf2e87c
+JAXWS_MD5SUM = 4524646c2cb4e21f80bd17408485588e
+JDK_MD5SUM = 62599b14fbf2352c5cc1cb23ccbef683
+LANGTOOLS_MD5SUM = c04a42138a860df67a396de51fcf11b6
+OPENJDK_MD5SUM = bad6c4ca26dfc18aa719dc9636a5c353
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
diff -r 05e6f20fb7fd -r 1a7fa6604936 patches/boot/icedtea.patch
--- a/patches/boot/icedtea.patch Wed Oct 14 02:18:26 2009 +0100
+++ b/patches/boot/icedtea.patch Wed Oct 28 01:09:18 2009 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/make/c
diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-10-05 02:23:42.764274773 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-10-07 15:38:47.674613200 +0100
+--- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@ diff -Nru openjdk-boot.orig/corba/make/c
diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-10-07 15:38:47.675617951 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -53,8 +53,8 @@ diff -Nru openjdk-boot.orig/corba/make/c
+#
+include $(BUILDDIR)/common/Classes.gmk
diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-10-05 02:23:42.789274774 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-07 15:38:47.675617951 +0100
+--- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@ diff -Nru openjdk-boot.orig/corba/make/c
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-10-07 15:24:05.904817673 +0100
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-10-07 15:38:47.676817980 +0100
+--- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -276,7 +276,7 @@
fi; \
done)
@@ -100,8 +100,8 @@ diff -Nru openjdk-boot.orig/corba/make/c
#
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk 2009-10-05 02:23:42.791274645 +0100
-+++ openjdk-boot/corba/make/common/Rules.gmk 2009-10-07 16:12:31.682568618 +0100
+--- openjdk-boot.orig/corba/make/common/Rules.gmk 2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Rules.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -187,7 +187,10 @@
@$(MKDIR) -p $(CLASSDESTDIR)
if [ -s $(JAVA_SOURCE_LIST) ] ; then \
@@ -115,8 +115,8 @@ diff -Nru openjdk-boot.orig/corba/make/c
@$(java-vm-cleanup)
diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2009-10-05 02:23:42.794274731 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-10-07 15:38:47.679816586 +0100
+--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2009-09-04 02:41:12.000000000 +0100
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -135,31 +135,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -156,8 +156,8 @@ diff -Nru openjdk-boot.orig/corba/make/c
# Override of what javac to use (see deploy workspace)
ifdef JAVAC
diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
---- openjdk-boot.orig/corba/make/org/omg/sources/Makefile 2009-10-05 02:23:42.806274729 +0100
-+++ openjdk-boot/corba/make/org/omg/sources/Makefile 2009-10-07 15:38:47.680818473 +0100
+--- openjdk-boot.orig/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/org/omg/sources/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -235,8 +235,8 @@ diff -Nru openjdk-boot.orig/corba/make/o
pi.compile: $(PIGENERATEDFILES)
diff -Nru openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-10-05 02:23:42.812274414 +0100
-+++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-10-07 15:38:47.681818474 +0100
+--- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100
++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -254,8 +254,8 @@ diff -Nru openjdk-boot.orig/corba/make/s
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml 2009-10-05 02:24:21.770015267 +0100
-+++ openjdk-boot/jaxp/build.xml 2009-10-07 16:39:42.444567810 +0100
+--- openjdk-boot.orig/jaxp/build.xml 2009-10-03 00:22:23.000000000 +0100
++++ openjdk-boot/jaxp/build.xml 2009-10-26 13:38:03.000000000 +0000
@@ -112,7 +112,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -267,9 +267,9 @@ diff -Nru openjdk-boot.orig/jaxp/build.x
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
---- openjdk-boot.orig/jaxp/make/Makefile 2009-10-07 15:24:04.171575396 +0100
-+++ openjdk-boot/jaxp/make/Makefile 2009-10-07 15:43:16.588568762 +0100
-@@ -106,6 +106,7 @@
+--- openjdk-boot.orig/jaxp/make/Makefile 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/jaxp/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+@@ -110,6 +110,7 @@
ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -278,8 +278,8 @@ diff -Nru openjdk-boot.orig/jaxp/make/Ma
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml 2009-10-05 02:24:35.787025014 +0100
-+++ openjdk-boot/jaxws/build.xml 2009-10-07 15:46:46.606568793 +0100
+--- openjdk-boot.orig/jaxws/build.xml 2009-10-03 00:57:53.000000000 +0100
++++ openjdk-boot/jaxws/build.xml 2009-10-26 13:38:03.000000000 +0000
@@ -112,7 +112,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -291,9 +291,9 @@ diff -Nru openjdk-boot.orig/jaxws/build.
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile 2009-10-07 15:24:04.172573022 +0100
-+++ openjdk-boot/jaxws/make/Makefile 2009-10-07 15:48:24.010585640 +0100
-@@ -107,6 +107,7 @@
+--- openjdk-boot.orig/jaxws/make/Makefile 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/jaxws/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+@@ -111,6 +111,7 @@
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
@@ -302,8 +302,8 @@ diff -Nru openjdk-boot.orig/jaxws/make/M
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk 2009-10-05 02:26:27.187170082 +0100
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-10-07 15:38:47.709568471 +0100
+--- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -315,8 +315,8 @@ diff -Nru openjdk-boot.orig/jdk/make/com
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_JAR_JFLAGS) || $(RM) $@
diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk 2009-10-07 15:24:07.006566514 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk 2009-10-07 15:38:47.711568544 +0100
+--- openjdk-boot.orig/jdk/make/common/Release.gmk 2009-10-23 15:59:17.000000000 +0100
++++ openjdk-boot/jdk/make/common/Release.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -650,10 +650,21 @@
RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
@@ -378,8 +378,8 @@ diff -Nru openjdk-boot.orig/jdk/make/com
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-10-05 02:26:27.196170409 +0100
-+++ openjdk-boot/jdk/make/common/Rules.gmk 2009-10-07 15:38:47.712568265 +0100
+--- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/Rules.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -406,8 +406,8 @@ diff -Nru openjdk-boot.orig/jdk/make/com
@$(TOUCH) $@
diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2009-10-07 15:24:05.355571407 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-10-07 15:38:47.713567987 +0100
+--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -136,33 +136,22 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -442,10 +442,10 @@ diff -Nru openjdk-boot.orig/jdk/make/com
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
endif
- # Override of what javac to use (see deploy workspace)
+ #always use the bootstrap javah until bug-ID 6889255 is fixed. These
diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-10-07 15:24:06.305563660 +0100
-+++ openjdk-boot/jdk/make/java/nio/Makefile 2009-10-07 15:38:47.713567987 +0100
+--- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-10-23 15:59:17.000000000 +0100
++++ openjdk-boot/jdk/make/java/nio/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -456,8 +456,8 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -Nru openjdk-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
---- openjdk-boot.orig/jdk/make/java/text/Makefile 2009-10-05 02:26:27.255175614 +0100
-+++ openjdk-boot/jdk/make/java/text/Makefile 2009-10-07 15:38:47.714571480 +0100
+--- openjdk-boot.orig/jdk/make/java/text/Makefile 2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/java/text/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -81,8 +81,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -470,8 +470,8 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
-spec $(UNICODEDATA)/UnicodeData.txt
@$(java-vm-cleanup)
diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile 2009-10-05 02:26:27.150170023 +0100
-+++ openjdk-boot/jdk/make/Makefile 2009-10-07 15:38:47.714571480 +0100
+--- openjdk-boot.orig/jdk/make/Makefile 2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -482,8 +482,8 @@ diff -Nru openjdk-boot.orig/jdk/make/Mak
$(SUBDIRS-loop)
diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-10-05 02:26:27.369170078 +0100
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-10-07 15:38:47.714571480 +0100
+--- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -189,3 +189,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -491,8 +491,8 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
+EXPORTED_inner = \
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
---- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2009-10-05 02:26:27.370170084 +0100
-+++ openjdk-boot/jdk/make/sun/awt/Makefile 2009-10-07 15:38:47.715565824 +0100
+--- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -401,10 +401,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -508,8 +508,8 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
fontconfigs.clean :
diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
---- openjdk-boot.orig/jdk/make/sun/javazic/Makefile 2009-10-05 02:26:27.397170089 +0100
-+++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-10-07 15:38:47.715565824 +0100
+--- openjdk-boot.orig/jdk/make/sun/javazic/Makefile 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -521,8 +521,8 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
---- openjdk-boot.orig/jdk/make/sun/text/Makefile 2009-10-05 02:26:27.461169942 +0100
-+++ openjdk-boot/jdk/make/sun/text/Makefile 2009-10-07 15:38:47.715565824 +0100
+--- openjdk-boot.orig/jdk/make/sun/text/Makefile 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/text/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -536,8 +536,8 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
-spec $(UNICODEDATA)/UnicodeData.txt \
-language th
diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- openjdk-boot.orig/jdk/make/sun/xawt/Makefile 2009-10-07 15:24:07.253598085 +0100
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-07 15:38:47.716565825 +0100
+--- openjdk-boot.orig/jdk/make/sun/xawt/Makefile 2009-10-23 15:59:17.000000000 +0100
++++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -294,11 +294,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -575,8 +575,8 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
done
$(TOUCH) $@
diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-07 15:23:51.404565029 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-07 15:38:47.717563312 +0100
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-23 15:58:41.000000000 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-26 13:38:03.000000000 +0000
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -596,8 +596,8 @@ diff -Nru openjdk-boot.orig/jdk/make/too
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java 2009-10-07 15:23:17.171575470 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-07 15:38:47.717563312 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java 2009-10-23 15:58:32.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-26 13:38:03.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -626,8 +626,8 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Maximum exponent a finite {@code double} variable may have.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java 2009-10-07 15:23:17.217575862 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-07 15:38:47.718563663 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java 2009-10-23 15:58:32.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-26 13:38:03.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -656,8 +656,8 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Maximum exponent a finite {@code float} variable may have. It
diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-10-05 02:26:33.493169843 +0100
-+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-10-07 15:38:47.718563663 +0100
+--- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100
++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-10-26 13:38:03.000000000 +0000
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -723,8 +723,8 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Evaluates to true if the given capability bitmask is present for the
diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml 2009-10-05 02:26:48.779920205 +0100
-+++ openjdk-boot/langtools/make/build.xml 2009-10-07 15:38:47.719564153 +0100
+--- openjdk-boot.orig/langtools/make/build.xml 2009-10-21 16:40:37.000000000 +0100
++++ openjdk-boot/langtools/make/build.xml 2009-10-26 13:38:03.000000000 +0000
@@ -524,6 +524,7 @@
includeAntRuntime="no"
source="@{javac.source}"
@@ -742,8 +742,8 @@ diff -Nru openjdk-boot.orig/langtools/ma
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
---- openjdk-boot.orig/langtools/make/Makefile 2009-10-07 15:24:04.172573022 +0100
-+++ openjdk-boot/langtools/make/Makefile 2009-10-07 15:38:47.719564153 +0100
+--- openjdk-boot.orig/langtools/make/Makefile 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/langtools/make/Makefile 2009-10-26 13:38:03.000000000 +0000
@@ -130,7 +130,7 @@
ifdef ALT_BOOTDIR
@@ -754,8 +754,8 @@ diff -Nru openjdk-boot.orig/langtools/ma
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-boot.orig/make/jdk-rules.gmk openjdk-boot/make/jdk-rules.gmk
---- openjdk-boot.orig/make/jdk-rules.gmk 2009-10-07 15:24:05.158577449 +0100
-+++ openjdk-boot/make/jdk-rules.gmk 2009-10-07 15:38:47.719564153 +0100
+--- openjdk-boot.orig/make/jdk-rules.gmk 2009-10-23 15:59:16.000000000 +0100
++++ openjdk-boot/make/jdk-rules.gmk 2009-10-26 13:38:03.000000000 +0000
@@ -58,7 +58,7 @@
endif
diff -r 05e6f20fb7fd -r 1a7fa6604936 patches/xrender/icedtea-001.patch
--- a/patches/xrender/icedtea-001.patch Wed Oct 14 02:18:26 2009 +0100
+++ b/patches/xrender/icedtea-001.patch Wed Oct 28 01:09:18 2009 +0000
@@ -1,7 +1,7 @@ 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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/font/FILES_c.gmk 2009-05-13 01:02:29.000000000 +0100
-@@ -119,6 +119,7 @@
+--- 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
+@@ -115,6 +115,7 @@
FILES_cpp_platform =
else
FILES_c_platform = X11FontScaler.c \
@@ -10,8 +10,8 @@ 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-05-13 00:07:23.000000000 +0100
-+++ openjdk/jdk/make/sun/font/Makefile 2009-05-13 01:02:29.000000000 +0100
+--- 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 @@
sun/font/NativeStrike.java \
sun/font/NativeStrikeDisposer.java \
@@ -21,9 +21,9 @@ 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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/font/mapfile-vers 2009-05-13 01:02:29.000000000 +0100
-@@ -63,6 +63,7 @@
+--- 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
+@@ -56,6 +56,7 @@
Java_sun_font_NativeFont_getGlyphImage;
Java_sun_font_NativeFont_getGlyphImageNoDefault;
Java_sun_font_NativeFont_getFontMetrics;
@@ -32,9 +32,9 @@ 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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2009-05-13 01:02:29.000000000 +0100
-@@ -82,6 +82,7 @@
+--- 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
+@@ -75,6 +75,7 @@
Java_sun_font_FreetypeFontScaler_getUnitsPerEMNative;
Java_sun_font_FreetypeFontScaler_initNativeScaler;
Java_sun_font_FreetypeFontScaler_getGlyphPointNative;
@@ -44,7 +44,7 @@ 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-05-13 01:03:14.000000000 +0100
++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2009-10-23 14:35:23.000000000 +0100
@@ -79,4 +79,11 @@
gtk2_interface.c \
swing_GTKEngine.c \
@@ -60,7 +60,7 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
+ 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-05-13 01:02:29.000000000 +0100
++++ openjdk/jdk/make/sun/xawt/Makefile 2009-10-23 14:35:23.000000000 +0100
@@ -87,7 +87,7 @@
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
@@ -71,8 +71,8 @@ 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-05-08 16:10:44.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-05-13 01:02:29.000000000 +0100
+--- 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 @@
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-05-13 00:06:33.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2009-05-13 01:02:29.000000000 +0100
+--- 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
@@ -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
More information about the distro-pkg-dev
mailing list