changeset in /hg/icedtea: Upgrade to OpenJDK b29.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 16:22:11 PDT 2008
changeset 2346ce8ee96a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2346ce8ee96a
description:
Upgrade to OpenJDK b29.
diffstat:
30 files changed, 129 insertions(+), 16266 deletions(-)
ChangeLog | 40
Makefile.am | 21
Makefile.in | 29
generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 3
generated/com/sun/corba/se/impl/logging/IORSystemException.java | 3
generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 3
generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 3
generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 3
generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 3
generated/com/sun/corba/se/impl/logging/POASystemException.java | 3
generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 3
patches/icedtea-color-profiles.patch | 29
patches/icedtea-core-build.patch | 6
patches/icedtea-debuginfo.patch | 6
patches/icedtea-dnd-updatecursor.patch | 10
patches/icedtea-ecj.patch | 12
patches/icedtea-eclipse-hotspot-6614100-6b06.patch | 56
patches/icedtea-eclipse-hotspot-6614100-7b24.patch | 77
patches/icedtea-gcc-4.3.patch | 8
patches/icedtea-gcc-suffix.patch | 4
patches/icedtea-gtkplaf.patch | 23
patches/icedtea-headers.patch | 6
patches/icedtea-sparc.patch | 14
patches/icedtea-sparc64-linux.patch | 52
patches/icedtea-static-libstdc++.patch | 6
patches/icedtea-text-relocations.patch | 4
patches/icedtea-xinerama.patch | 84
patches/icedtea-xslfix.patch | 19
patches/icedtea-zero-build.patch | 36
patches/openjdk-color.patch |15829 ----------
diffs (truncated from 16806 to 500 lines):
diff -r 837aa402fd1c -r 2346ce8ee96a ChangeLog
--- a/ChangeLog Sun Jun 22 20:31:08 2008 +0100
+++ b/ChangeLog Mon Jun 23 00:21:54 2008 +0100
@@ -1,3 +1,43 @@ 2008-06-22 Andrew John Hughes <gnu_and
+2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-color-profiles.patch,
+ * patches/icedtea-dnd-updatecursor.patch,
+ * patches/icedtea-eclipse-hotspot-6614100-6b06.patch,
+ * patches/icedtea-eclipse-hotspot-6614100-7b24.patch,
+ * patches/icedtea-gtkplaf.patch,
+ * patches/icedtea-xinerama.patch,
+ * patches/icedtea-xslfix.patch,
+ * patches/openjdk-color.patch:
+ Removed as present in OpenJDK b29.
+ * Makefile.am:
+ Move to b29 and change hotspot/build to hotspot/make.
+ * Makefile.in:
+ Regenerated.
+ * generated/com/sun/corbse/impl/logging/ActivationSystemException.java,
+ * generated/com/sun/corbse/impl/logging/IORSystemException.java,
+ * generated/com/sun/corbse/impl/logging/InterceptorsSystemException.java,
+ * generated/com/sun/corbse/impl/logging/NamingSystemException.java,
+ * generated/com/sun/corbse/impl/logging/OMGSystemException.java,
+ * generated/com/sun/corbse/impl/logging/ORBUtilSystemException.java,
+ * generated/com/sun/corbse/impl/logging/POASystemException.java,
+ * generated/com/sun/corbse/impl/logging/UtilSystemException.java:
+ New versions generated by the JScheme replacement (different headers).
+ * patches/icedtea-core-build.patch,
+ * patches/icedtea-debuginfo.patch,
+ * patches/icedtea-ecj.patch,
+ * patches/icedtea-gcc-4.3.patch,
+ * patches/icedtea-gcc-suffix.patch,
+ * patches/icedtea-headers.patch:
+ Change hotspot/build to hotspot/make.
+ * patches/icedtea-sparc.patch:
+ Removed as present in b29.
+ * patches/icedtea-sparc64-linux.patch:
+ Reapplied against b29.
+ * patches/icedtea-static-libstdc++.patch,
+ * patches/icedtea-text-relocations.patch,
+ * patches/icedtea-zero-build.patch:
+ Change hotspot/build to hotspot/make.
+
2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-component.patch:
diff -r 837aa402fd1c -r 2346ce8ee96a Makefile.am
--- a/Makefile.am Sun Jun 22 20:31:08 2008 +0100
+++ b/Makefile.am Mon Jun 23 00:21:54 2008 +0100
@@ -1,4 +1,4 @@ OPENJDK_VERSION = b26
-OPENJDK_VERSION = b26
+OPENJDK_VERSION = b29
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
@@ -253,12 +253,12 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/make/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
@@ -278,8 +278,7 @@ endif
# Patches from the other OpenJDK trees (should be removed
# when in an official bxx release)
-OPENJDK_PATCHES = \
- patches/openjdk-color.patch
+OPENJDK_PATCHES =
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -317,7 +316,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
- patches/icedtea-gtkplaf.patch \
patches/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
@@ -333,29 +331,22 @@ ICEDTEA_PATCHES = \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
- patches/icedtea-xinerama.patch \
patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
- patches/icedtea-color-profiles.patch \
patches/icedtea-fonts.patch \
patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
- patches/icedtea-hat-spl-gpl.patch \
- patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
$(ZERO_PATCHES_COND) \
- patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
patches/icedtea-no-bcopy.patch \
patches/icedtea-jscheme.patch \
- patches/icedtea-dnd-updatecursor.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
- patches/icedtea-xslfix.patch \
patches/icedtea-override.patch
if WITH_CACAO
@@ -450,12 +441,12 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/make/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
diff -r 837aa402fd1c -r 2346ce8ee96a Makefile.in
--- a/Makefile.in Sun Jun 22 20:31:08 2008 +0100
+++ b/Makefile.in Mon Jun 23 00:21:54 2008 +0100
@@ -251,7 +251,7 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b26
+OPENJDK_VERSION = b29
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -373,9 +373,7 @@ OPENJDK_URL = http://hg.openjdk.java.net
# Patches from the other OpenJDK trees (should be removed
# when in an official bxx release)
-OPENJDK_PATCHES = \
- patches/openjdk-color.patch
-
+OPENJDK_PATCHES =
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -404,7 +402,6 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
- patches/icedtea-gtkplaf.patch \
patches/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
@@ -417,24 +414,20 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
- patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+ patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
- patches/icedtea-color-profiles.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
- patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
- $(ZERO_PATCHES_COND) \
- patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
- patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
- patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
- patches/icedtea-override.patch $(am__append_7)
+ $(ZERO_PATCHES_COND) patches/icedtea-no-bcopy.patch \
+ patches/icedtea-jscheme.patch $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) patches/icedtea-override.patch \
+ $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -854,12 +847,12 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/make/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
@@ -957,12 +950,12 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/make/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/ActivationSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group ACTIVATION
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc on Sun Jun 22 23:48:17 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/IORSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/IORSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/IORSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group IOR
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc on Sun Jun 22 23:48:17 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group INTERCEPTORS
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc on Sun Jun 22 23:48:17 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/NamingSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/NamingSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/NamingSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group NAMING
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc on Sun Jun 22 23:48:18 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/OMGSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/OMGSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/OMGSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for standard exceptions
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc on Sun Jun 22 23:48:18 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group ORBUTIL
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc on Sun Jun 22 23:48:18 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/POASystemException.java
--- a/generated/com/sun/corba/se/impl/logging/POASystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/POASystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group POA
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc on Sun Jun 22 23:48:19 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/UtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/UtilSystemException.java Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/UtilSystemException.java Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
// Log wrapper class for Sun private system exceptions in group UTIL
//
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc on Sun Jun 22 23:48:19 BST 2008
package com.sun.corba.se.impl.logging ;
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-color-profiles.patch
--- a/patches/icedtea-color-profiles.patch Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Changeset: 804b0757d801
-# Author: prr
-# Date: 2008-04-24 11:58 -0700
-# URL: http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801
-#
-# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
-# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix.
-# Reviewed-by: jgodinez, avu, prr
-# Contributed-by: aph at redhat.com
-#
-# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/
-
---- openjdk/jdk/make/sun/cmm/Makefile.orig 2008-04-27 23:59:37.000000000 +0200
-+++ openjdk/jdk/make/sun/cmm/Makefile 2008-04-27 23:59:45.000000000 +0200
-@@ -41,12 +41,8 @@
- ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
-
- iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
-- $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
--
--ifndef OPENJDK
--iccprofiles: $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-- $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
--endif
-+ $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-+ $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
-
- $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-core-build.patch Mon Jun 23 00:21:54 2008 +0100
@@ -15,9 +15,9 @@ diff -Nru openjdk.orig/corba/make/common
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
@@ -97,6 +97,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-debuginfo.patch
--- a/patches/icedtea-debuginfo.patch Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-debuginfo.patch Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,6 @@ diff -urN openjdk.orig/hotspot/build/lin
-diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/build/linux/makefiles/gcc.make 2007-10-12 18:11:59.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make 2007-10-12 18:12:22.000000000 -0400
+diff -urN openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2007-10-12 18:11:59.000000000 -0400
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2007-10-12 18:12:22.000000000 -0400
@@ -63,6 +63,10 @@
CFLAGS += -D_REENTRANT
CFLAGS += -fcheck-new
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-dnd-updatecursor.patch
--- a/patches/icedtea-dnd-updatecursor.patch Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java.orig 2008-06-16 12:11:39.000000000 -0700
-+++ openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java 2008-06-16 12:18:39.000000000 -0700
-@@ -466,7 +466,6 @@
-
- Cursor c = null;
-
-- targetAct = DnDConstants.ACTION_NONE;
- switch (status) {
- case ENTER:
- case OVER:
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-ecj.patch Mon Jun 23 00:21:54 2008 +0100
@@ -489,9 +489,9 @@ diff -Nru openjdk-ecj.orig/corba/src/sha
(.println pw)))
(define (write-factory-method class-name exception-group-name pw)
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
---- openjdk-ecj.orig/hotspot/build/linux/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/Makefile 2008-06-22 19:05:57.000000000 +0100
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-05-27 22:28:29.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-06-22 19:05:57.000000000 +0100
@@ -249,28 +249,24 @@
$(TARGETS_C2): $(SUBDIRS_C2)
@@ -521,9 +521,9 @@ diff -Nru openjdk-ecj.orig/hotspot/build
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make 2008-06-22 18:36:24.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-06-22 19:05:57.000000000 +0100
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-06-22 19:05:57.000000000 +0100
@@ -72,7 +72,7 @@
$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
mkdir -p $(SA_CLASSDIR); \
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-eclipse-hotspot-6614100-6b06.patch
--- a/patches/icedtea-eclipse-hotspot-6614100-6b06.patch Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1212727493 25200
-# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
-# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
-6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
-Reviewed-by: kvn, jrose, rasbold
-
---- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig 2008-06-08 15:15:19.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp 2008-06-08 15:16:06.000000000 +0200
-@@ -1551,45 +1551,6 @@
- if (opt != NULL) return opt;
- }
-
-- if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-- // Try to undo Phi of AddP:
-- // (Phi (AddP base base y) (AddP base2 base2 y))
-- // becomes:
-- // newbase := (Phi base base2)
-- // (AddP newbase newbase y)
-- //
-- // This occurs as a result of unsuccessful split_thru_phi and
-- // interferes with taking advantage of addressing modes. See the
-- // clone_shift_expressions code in matcher.cpp
-- Node* addp = in(1);
-- const Type* type = addp->in(AddPNode::Base)->bottom_type();
-- Node* y = addp->in(AddPNode::Offset);
-- if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-- // make sure that all the inputs are similar to the first one,
-- // i.e. AddP with base == address and same offset as first AddP
-- bool doit = true;
-- for (uint i = 2; i < req(); i++) {
-- if (in(i) == NULL ||
-- in(i)->Opcode() != Op_AddP ||
-- in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-- in(i)->in(AddPNode::Offset) != y) {
-- doit = false;
-- break;
-- }
-- // Accumulate type for resulting Phi
-- type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-- }
-- if (doit) {
-- Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-- for (uint i = 1; i < req(); i++) {
-- base->init_req(i, in(i)->in(AddPNode::Base));
-- }
-- phase->is_IterGVN()->register_new_node_with_optimizer(base);
-- return new (phase->C, 4) AddPNode(base, base, y);
-- }
-- }
-- }
--
- // Split phis through memory merges, so that the memory merges will go away.
- // Piggy-back this transformation on the search for a unique input....
- // It will be as if the merged memory is the unique value of the phi.
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-eclipse-hotspot-6614100-7b24.patch
--- a/patches/icedtea-eclipse-hotspot-6614100-7b24.patch Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1212727493 25200
More information about the distro-pkg-dev
mailing list