Mercurial > hg > release > icedtea-1.10
changeset 1769:1fe13f115ab0
Support building current IcedTea forest.
2009-04-16 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-java2d-dasher.patch,
* patches/icedtea-jscheme.patch,
* patches/icedtea-snmp.patch:
Dropped, first two upstream, default of
no binary plugs makes third obsolete.
* Makefile.am: Updated.
* acinclude.m4: Find IcedTea on F10.
* patches/ecj/icedtea.patch,
* patches/icedtea-alpha-fixes.patch,
* patches/icedtea-arch.patch,
* patches/icedtea-doc-headers.patch,
* patches/icedtea-gcc-suffix.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-tests-jdk.patch,
* patches/icedtea-uname.patch,
* patches/icedtea-zero-build.patch:
Recreated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 22 Apr 2009 16:53:21 +0100 |
| parents | bf7c34ac17a5 |
| children | ac22a2f56293 |
| files | ChangeLog Makefile.am acinclude.m4 patches/ecj/icedtea.patch patches/icedtea-alpha-fixes.patch patches/icedtea-arch.patch patches/icedtea-doc-headers.patch patches/icedtea-gcc-suffix.patch patches/icedtea-java2d-dasher.patch patches/icedtea-jscheme.patch patches/icedtea-libraries.patch patches/icedtea-linker-libs-order.patch patches/icedtea-snmp.patch patches/icedtea-tests-jdk.patch patches/icedtea-uname.patch patches/icedtea-zero-build.patch |
| diffstat | 16 files changed, 383 insertions(+), 1954 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 20 11:57:47 2009 +0000 +++ b/ChangeLog Wed Apr 22 16:53:21 2009 +0100 @@ -1,3 +1,24 @@ +2009-04-16 Andrew John Hughes <ahughes@redhat.com> + + * patches/icedtea-java2d-dasher.patch, + * patches/icedtea-jscheme.patch, + * patches/icedtea-snmp.patch: + Dropped, first two upstream, default of + no binary plugs makes third obsolete. + * Makefile.am: Updated. + * acinclude.m4: Find IcedTea on F10. + * patches/ecj/icedtea.patch, + * patches/icedtea-alpha-fixes.patch, + * patches/icedtea-arch.patch, + * patches/icedtea-doc-headers.patch, + * patches/icedtea-gcc-suffix.patch, + * patches/icedtea-libraries.patch, + * patches/icedtea-linker-libs-order.patch, + * patches/icedtea-tests-jdk.patch, + * patches/icedtea-uname.patch, + * patches/icedtea-zero-build.patch: + Recreated. + 2009-03-20 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Switch to IcedTea
--- a/Makefile.am Fri Mar 20 11:57:47 2009 +0000 +++ b/Makefile.am Wed Apr 22 16:53:21 2009 +0100 @@ -1741,8 +1741,7 @@ endif ICEDTEA_FSG_PATCHES = \ - patches/icedtea-idl.patch \ - patches/icedtea-jscheme.patch + patches/icedtea-idl.patch ICEDTEA_PATCHES = \ patches/icedtea-version.patch \ @@ -1806,7 +1805,6 @@ patches/icedtea-javac-debuginfo.patch \ patches/icedtea-xjc.patch \ patches/icedtea-renderer-crossing.patch \ - patches/icedtea-snmp.patch \ patches/icedtea-tests-jdk.patch \ patches/icedtea-stroker-finish.patch \ patches/icedtea-alsa-default-device.patch \ @@ -1826,7 +1824,6 @@ patches/security/icedtea-6766136.patch \ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ patches/icedtea-demo-swingapplet.patch \ - patches/icedtea-java2d-dasher.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \
--- a/acinclude.m4 Fri Mar 20 11:57:47 2009 +0000 +++ b/acinclude.m4 Wed Apr 22 16:53:21 2009 +0100 @@ -1164,7 +1164,8 @@ SYSTEM_ICEDTEA_DIR= ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do + for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ + /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do if test -d $dir; then SYSTEM_ICEDTEA_DIR=$dir break
--- a/patches/ecj/icedtea.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/ecj/icedtea.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile ---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -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-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile --- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-02-10 19:24:54.000000000 +0000 ++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -0,0 +1,38 @@ +# +# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. @@ -53,8 +53,8 @@ +# +include $(BUILDDIR)/common/Classes.gmk diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk ---- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -53,6 +53,13 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -88,8 +88,8 @@ vpath %.java $(VPATH.java) vpath %.class $(CLASSBINDIR) diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk ---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -276,7 +276,7 @@ fi; \ done) @@ -100,14 +100,14 @@ # # We want to privatize JVM symbols on Solaris. This is so the user can diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk ---- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -197,8 +197,10 @@ +--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-04-14 15:55:17.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-04-16 18:35:11.000000000 +0100 +@@ -201,8 +201,10 @@ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ $(CAT) $(JAVA_SOURCE_LIST); \ $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ + -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ @@ -116,16 +116,16 @@ @$(java-vm-cleanup) diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk ---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -110,31 +110,13 @@ +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-04-16 18:32:43.000000000 +0100 +@@ -113,31 +113,14 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah --JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) -+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) +-JAVAHFLAGS += -classpath $(CLASSBINDIR) ++JAVAHFLAGS += -classpath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) --# Langtools + # Langtools -ifdef LANGTOOLS_DIST - JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar - JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar @@ -143,20 +143,22 @@ -else - # If no explicit tools, use boot tools (add VM flags in this case) - JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ +- $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ +- $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif +# If no explicit tools, use boot tools (add VM flags in this case) +JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ - $(JAVACFLAGS) -- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++ $(JAVACFLAGS) +JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ - $(JAVAHFLAGS) -- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) --endif ++ $(JAVAHFLAGS) # Override of what javac to use (see deploy workspace) ifdef JAVAC diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile ---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -93,8 +93,6 @@ POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) @@ -234,8 +236,8 @@ pi.compile: $(PIGENERATEDFILES) diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile ---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 18:11:57.000000000 +0000 -+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-14 15:55:18.000000000 +0100 ++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -172,7 +172,6 @@ ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) @@ -253,8 +255,8 @@ portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml ---- openjdk-ecj.orig/jaxp/make/build.xml 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxp/make/build.xml 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxp/make/build.xml 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxp/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -71,7 +71,10 @@ <mkdir dir="${build.toolclasses.dir}"/> <javac srcdir="${make.tools.dir}/StripProperties" @@ -277,8 +279,8 @@ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> <compilerarg line="${javac.version.opt}"/> diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile ---- openjdk-ecj.orig/jaxp/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxp/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxp/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxp/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -75,7 +75,7 @@ endif @@ -289,8 +291,8 @@ ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties ---- openjdk-ecj.orig/jaxws/make/build.properties 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/build.properties 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/build.properties 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.properties 2009-04-16 18:21:48.000000000 +0100 @@ -37,7 +37,7 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = @@ -301,8 +303,8 @@ # JVM memory size javac.memoryInitialSize = 128m diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml ---- openjdk-ecj.orig/jaxws/make/build.xml 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/build.xml 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/build.xml 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -84,7 +84,10 @@ <mkdir dir="${build.toolclasses.dir}"/> <javac srcdir="${make.tools.dir}/StripProperties" @@ -333,8 +335,8 @@ <compilerarg line="${javac.version.opt}"/> <compilerarg line="${javac.no.jdk.warnings}"/> diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile ---- openjdk-ecj.orig/jaxws/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -75,8 +75,8 @@ endif @@ -347,8 +349,8 @@ ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk ---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -43,7 +43,8 @@ @$(prep-target) @$(MKDIR) -p $(BUILDTOOLCLASSDIR) @@ -360,8 +362,8 @@ -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ $(BOOT_JAR_JFLAGS) || $(RM) $@ diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk ---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-02-10 18:12:01.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-04-16 15:16:31.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -651,10 +651,23 @@ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) $(prep-target) @@ -447,8 +449,8 @@ $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) endif # !windows diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk ---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -237,8 +237,9 @@ $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ $(CAT) $<.filtered; \ @@ -475,15 +477,18 @@ @$(TOUCH) $@ diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk ---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -121,30 +121,19 @@ +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-04-16 18:28:27.000000000 +0100 +@@ -129,33 +129,22 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah -JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) +JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + # Langtools ifdef LANGTOOLS_DIST - JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar @@ -510,8 +515,8 @@ # Override of what javac to use (see deploy workspace) diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile ---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-02-05 08:44:13.000000000 +0000 -+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -31,7 +31,7 @@ PACKAGE = java.nio LIBRARY = nio @@ -522,8 +527,8 @@ NIO_SRC = $(SHARE_SRC)/classes/java/nio diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile ---- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-02-05 08:44:13.000000000 +0000 -+++ openjdk-ecj/jdk/make/java/text/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -80,8 +80,8 @@ -sourcepath $(TEXT_SRCDIR) \ $(TEXT_SOURCES) @@ -536,8 +541,8 @@ -spec $(UNICODEDATA)/UnicodeData.txt @$(java-vm-cleanup) diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile ---- openjdk-ecj.orig/jdk/make/Makefile 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -239,7 +239,7 @@ all build:: sanity-all post-sanity-all @@ -548,8 +553,8 @@ $(SUBDIRS-loop) diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk ---- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -188,3 +188,5 @@ java/awt/dnd/DnDConstants.java \ sun/awt/CausedFocusEvent.java @@ -557,9 +562,9 @@ +EXPORTED_inner = \ + sun.java2d.opengl.OGLContext$$OGLContextCaps diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile ---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-02-10 19:24:54.000000000 +0000 -@@ -395,10 +395,9 @@ +--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-04-16 18:21:48.000000000 +0100 +@@ -400,10 +400,9 @@ COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ @@ -574,8 +579,8 @@ fontconfigs.clean : diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile ---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -62,7 +62,8 @@ $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) $(RM) -r $(@D) @@ -587,8 +592,8 @@ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile ---- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -85,8 +85,9 @@ $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \ -sourcepath $(TEXT_SRCDIR) \ @@ -602,8 +607,8 @@ -spec $(UNICODEDATA)/UnicodeData.txt \ -language th diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile ---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-02-10 18:12:01.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-04-16 15:16:31.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -276,11 +276,7 @@ TEMPDIR_CLASSES = $(TEMPDIR)/classes @@ -641,8 +646,8 @@ done $(TOUCH) $@ diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 18:11:22.000000000 +0000 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 15:15:29.000000000 +0100 ++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 18:21:48.000000000 +0100 @@ -647,9 +647,6 @@ throws FileNotFoundException, IOException { BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); @@ -662,8 +667,8 @@ if (plane == 0 && bLatin1 == false) { genCaseMapTableDeclaration(result); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-02-10 18:11:12.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-04-16 15:15:12.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-04-16 18:21:48.000000000 +0100 @@ -76,7 +76,7 @@ * {@code 0x1.fffffffffffffP+1023} and also equal to * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. @@ -692,8 +697,8 @@ /** * Maximum exponent a finite {@code double} variable may have. diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-02-10 18:11:12.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-04-16 15:15:12.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-04-16 18:21:48.000000000 +0100 @@ -76,7 +76,7 @@ * {@code 0x1.fffffeP+127f} and also equal to * {@code Float.intBitsToFloat(0x7f7fffff)}. @@ -722,8 +727,8 @@ /** * Maximum exponent a finite {@code float} variable may have. It diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h ---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-05 08:44:52.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-04-16 18:21:48.000000000 +0100 @@ -27,6 +27,7 @@ #define OGLContext_h_Included @@ -789,8 +794,8 @@ /** * Evaluates to true if the given capability bitmask is present for the diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml ---- openjdk-ecj.orig/langtools/make/build.xml 2009-02-05 08:45:36.000000000 +0000 -+++ openjdk-ecj/langtools/make/build.xml 2009-02-10 19:56:00.000000000 +0000 +--- openjdk-ecj.orig/langtools/make/build.xml 2009-03-20 11:58:59.000000000 +0000 ++++ openjdk-ecj/langtools/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -502,7 +502,9 @@ includes="@{includes}" sourcepath="" @@ -824,8 +829,8 @@ classname="CompilePropertiesTask" classpath="${build.toolclasses.dir}/"/> diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile ---- openjdk-ecj.orig/langtools/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/langtools/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/langtools/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/langtools/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -112,7 +112,7 @@ ifdef ALT_BOOTDIR @@ -836,8 +841,8 @@ ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk ---- openjdk-ecj.orig/make/jdk-rules.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/make/jdk-rules.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/make/jdk-rules.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -58,7 +58,7 @@ endif
--- a/patches/icedtea-alpha-fixes.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-alpha-fixes.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-09-01 01:43:43.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-04-15 15:39:27.000000000 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2009-04-15 16:07:19.000000000 +0100 @@ -176,7 +176,8 @@ CXXFLAGS_DBG += $(CC_LOWER_OPT) endif @@ -12,8 +12,8 @@ ifeq ($(ARCH_DATA_MODEL), 64) diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile ---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:43:43.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2009-04-15 15:39:27.000000000 +0100 ++++ openjdk/hotspot/agent/src/os/linux/Makefile 2009-04-15 16:07:19.000000000 +0100 @@ -40,7 +40,7 @@ LIBS = -lthread_db @@ -33,9 +33,9 @@ test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -Nru openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp 2008-08-14 08:40:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp 2008-09-01 01:45:15.000000000 +0100 -@@ -2125,7 +2125,7 @@ +--- openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp 2009-04-14 15:55:46.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp 2009-04-15 16:07:19.000000000 +0100 +@@ -2113,7 +2113,7 @@ // We do not distinguish between different types of errors for verification // errors. Let the verifier give a better message. const char *msg = "Illegal class file encountered. Try running with -Xverify:all"; @@ -45,8 +45,8 @@ // diff -Nru openjdk.orig/jaxp/make/build.properties openjdk/jaxp/make/build.properties ---- openjdk.orig/jaxp/make/build.properties 2008-08-14 08:40:25.000000000 +0100 -+++ openjdk/jaxp/make/build.properties 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/jaxp/make/build.properties 2009-03-20 11:55:58.000000000 +0000 ++++ openjdk/jaxp/make/build.properties 2009-04-15 16:07:19.000000000 +0100 @@ -41,6 +41,6 @@ # JVM memory size @@ -56,8 +56,8 @@ #------------------------------------------------------------ diff -Nru openjdk.orig/jaxws/make/build.properties openjdk/jaxws/make/build.properties ---- openjdk.orig/jaxws/make/build.properties 2008-08-14 08:40:44.000000000 +0100 -+++ openjdk/jaxws/make/build.properties 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/jaxws/make/build.properties 2009-03-20 11:56:07.000000000 +0000 ++++ openjdk/jaxws/make/build.properties 2009-04-15 16:07:19.000000000 +0100 @@ -41,6 +41,6 @@ # JVM memory size @@ -67,10 +67,10 @@ #------------------------------------------------------------ diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-09-01 01:43:43.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-09-01 01:45:15.000000000 +0100 -@@ -175,7 +175,8 @@ - CXXFLAGS_DBG += $(CC_OPT/LOWER) +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-04-15 15:39:27.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2009-04-15 16:07:19.000000000 +0100 +@@ -186,7 +186,8 @@ + CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) endif -CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
--- a/patches/icedtea-arch.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-arch.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-10-17 02:24:36.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2008-10-17 02:38:35.000000000 +0100 +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-04-15 16:23:02.000000000 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2009-04-15 16:38:16.000000000 +0100 @@ -92,9 +92,19 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this @@ -22,9 +22,9 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-10-17 02:24:36.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-10-17 02:40:13.000000000 +0100 -@@ -106,9 +106,19 @@ +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-04-15 16:23:02.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2009-04-15 16:38:16.000000000 +0100 +@@ -109,9 +109,19 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. @@ -45,12 +45,12 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-17 02:24:36.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-17 02:43:21.000000000 +0100 -@@ -73,6 +73,52 @@ +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-15 16:23:02.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-15 16:39:22.000000000 +0100 +@@ -71,6 +71,52 @@ REQUIRED_CC_VER = 3.2 REQUIRED_GCC_VER = 3.2.* - else + endif + ifeq ($(ARCH), alpha) + # alpha + REQUIRED_CC_VER = 3.2 @@ -97,12 +97,12 @@ + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif - ifneq ("$(findstring sparc,$(ARCH))", "") - # sparc or sparcv9 - REQUIRED_CC_VER = 4.0 + # Option used to create a shared library + SHARED_LIBRARY_FLAG = -shared -mimpure-text + SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk ---- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2008-10-17 02:24:36.000000000 +0100 -+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2008-10-17 02:45:02.000000000 +0100 +--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2009-04-15 16:23:02.000000000 +0100 ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2009-04-15 16:38:16.000000000 +0100 @@ -58,10 +58,54 @@ ifdef ICEDTEA_ZERO_BUILD CPPFLAGS += -DX_ARCH=X_ZERO @@ -159,8 +159,8 @@ CPPFLAGS += -DX_ARCH=X_SPARC endif # ARCH sparc diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2008-10-17 02:24:36.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2008-10-17 02:45:36.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-04-15 16:23:02.000000000 +0100 ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-04-15 16:38:16.000000000 +0100 @@ -33,12 +33,21 @@ #define X_LINUX 3
--- a/patches/icedtea-doc-headers.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-doc-headers.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2009-02-11 00:49:35.000000000 +0000 -+++ openjdk/jdk/make/docs/Makefile 2009-02-11 00:55:31.000000000 +0000 -@@ -77,34 +77,19 @@ +--- openjdk.orig/jdk/make/docs/Makefile 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk/jdk/make/docs/Makefile 2009-04-15 23:13:07.000000000 +0100 +@@ -78,34 +78,19 @@ TAGS = $(IGNORED_TAGS:%=-tag %:X) $(TAG_JLS3) @@ -43,7 +43,7 @@ # # Variables used by domapidocs target -@@ -116,12 +101,11 @@ +@@ -117,12 +102,11 @@ -doctitle $(DOMAPI_JAVADOCTITLE) \ -windowtitle $(DOMAPI_JAVADOCWINDOWTITLE) \ -header $(DOMAPI_JAVADOCHEADER) \ @@ -57,7 +57,7 @@ DOMAPI_GROUPNAME = "Packages" DOMAPI_REGEXP = "com.sun.java.browser.dom:org.w3c.dom*" # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk -@@ -135,13 +119,12 @@ +@@ -136,13 +120,12 @@ -doctitle $(MIRROR_JAVADOCTITLE) \ -windowtitle $(MIRROR_JAVADOCWINDOWTITLE) \ -header $(MIRROR_JAVADOCHEADER) \ @@ -72,7 +72,7 @@ MIRROR_GROUPNAME = "Packages" MIRROR_OVERVIEW = $(IMPORTSRCDIR)/com/sun/mirror/overview.html MIRROR_REGEXP = "com.sun.mirror.*" -@@ -159,12 +142,11 @@ +@@ -160,12 +143,11 @@ -doctitle $(DOCLETAPI_JAVADOCTITLE) \ -windowtitle $(DOCLETAPI_JAVADOCWINDOWTITLE) \ -header $(DOCLETAPI_JAVADOCHEADER) \ @@ -86,7 +86,7 @@ DOCLETAPI_GROUPNAME = "Packages" DOCLETAPI_REGEXP = "com.sun.javadoc" DOCLETAPI_LINKOPT = -linkoffline ../../../../api $(DOCSDIR)/api/ -@@ -178,8 +160,7 @@ +@@ -179,8 +161,7 @@ -encoding ascii \ -nonavbar \ -noindex \ @@ -96,7 +96,7 @@ # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk # -@@ -196,6 +177,7 @@ +@@ -197,6 +178,7 @@ -windowtitle $(JDI_WINDOWTITLE) \ -doctitle $(JDI_DOCTITLE) \ -header $(JDI_HEADER) \ @@ -104,31 +104,44 @@ -linkoffline ../../../../api $(DOCSDIR)/api/ \ -overview $(JPDA_SOURCEPATH)/jdi-overview.html JDI_WINDOWTITLE = "Java Debug Interface" -@@ -220,6 +202,7 @@ +@@ -204,9 +186,6 @@ + JDI_HEADER = "Java Debug Interface" + # JDI_PKGS is located in NON_CORE_PKGS.gmk + +-# Variables used by security components +-SECURITYAPI_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Report a bug or request a feature.</a><br>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.</font>' +- + # + # Variables used by JAAS target + # +@@ -224,7 +203,7 @@ -windowtitle $(JAAS_WINDOWTITLE) \ -doctitle $(JAAS_DOCTITLE) \ -header $(JAAS_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ +- -bottom $(SECURITYAPI_JAVADOCBOTTOM) \ ++ -bottom $(JAVADOCBOTTOM) \ -linkoffline ../../../../../api $(DOCSDIR)/api/ \ -overview $(TOPDIR)/src/share/classes/com/sun/security/auth/jaas-overview.html JAAS_WINDOWTITLE = "Java Authentication and Authorization Service " -@@ -242,6 +225,7 @@ +@@ -247,7 +226,7 @@ -windowtitle $(JGSS_WINDOWTITLE) \ -doctitle $(JGSS_DOCTITLE) \ -header $(JGSS_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ +- -bottom $(SECURITYAPI_JAVADOCBOTTOM) \ ++ -bottom $(JAVADOCBOTTOM) \ -linkoffline ../../../../../api $(DOCSDIR)/api/ \ -overview $(JGSS_SOURCEPATH)/com/sun/security/jgss/jgss-overview.html -@@ -265,6 +249,7 @@ +@@ -271,7 +250,7 @@ -windowtitle $(SMARTCARDIO_WINDOWTITLE) \ -doctitle $(SMARTCARDIO_DOCTITLE) \ -header $(SMARTCARDIO_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ +- -bottom $(SECURITYAPI_JAVADOCBOTTOM) \ ++ -bottom $(JAVADOCBOTTOM) \ -linkoffline ../../../../../api $(DOCSDIR)/api/ SMARTCARDIO_WINDOWTITLE = "Java Smart Card I/O" -@@ -309,6 +294,7 @@ +@@ -316,6 +295,7 @@ -windowtitle $(HTTPSERVER_WINDOWTITLE) \ -doctitle $(HTTPSERVER_DOCTITLE) \ -header $(HTTPSERVER_JAVADOCHEADER) \ @@ -136,7 +149,7 @@ -linkoffline ../../../../../api $(DOCSDIR)/api/ HTTPSERVER_WINDOWTITLE = "Java HTTP Server" -@@ -338,6 +324,7 @@ +@@ -351,6 +331,7 @@ -windowtitle $(MGMT_WINDOWTITLE) \ -doctitle $(MGMT_DOCTITLE) \ -header $(MGMT_HEADER) \ @@ -144,7 +157,7 @@ -linkoffline ../../../../api $(DOCSDIR)/api/ \ -overview $(MGMT_SOURCEPATH)/com/sun/management/mgmt-overview.html MGMT_WINDOWTITLE = "Monitoring and Management Interface for the Java Platform" -@@ -359,6 +346,7 @@ +@@ -372,6 +353,7 @@ -windowtitle $(ATTACH_WINDOWTITLE) \ -doctitle $(ATTACH_DOCTITLE) \ -header $(ATTACH_HEADER) \ @@ -152,7 +165,7 @@ -linkoffline ../../../../api $(DOCSDIR)/api/ ATTACH_WINDOWTITLE = "Attach API" ATTACH_DOCTITLE = "Attach API" -@@ -379,6 +367,7 @@ +@@ -392,6 +374,7 @@ -windowtitle $(JCONSOLE_WINDOWTITLE) \ -doctitle $(JCONSOLE_DOCTITLE) \ -header $(JCONSOLE_HEADER) \ @@ -160,7 +173,7 @@ -linkoffline ../../../../api $(DOCSDIR)/api/ JCONSOLE_WINDOWTITLE = "JConsole API" JCONSOLE_DOCTITLE = "JConsole API" -@@ -394,7 +383,7 @@ +@@ -407,7 +390,7 @@ -doctitle $(TREEAPI_JAVADOCTITLE) \ -windowtitle $(TREEAPI_JAVADOCWINDOWTITLE) \ -header $(TREEAPI_JAVADOCHEADER) \ @@ -169,7 +182,7 @@ -group $(TREEAPI_GROUPNAME) $(TREEAPI_REGEXP) # # -overview $(TREEAPI_OVERVIEW) -@@ -402,7 +391,6 @@ +@@ -415,7 +398,6 @@ TREEAPI_JAVADOCTITLE = 'Compiler Tree API' TREEAPI_JAVADOCWINDOWTITLE = 'Compiler Tree API' TREEAPI_JAVADOCHEADER = '<strong>Compiler Tree API</strong>'
--- a/patches/icedtea-gcc-suffix.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-gcc-suffix.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,5 +1,6 @@ ---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk~ 2007-08-02 09:17:53.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2007-08-08 16:30:52.857814544 +0200 +diff -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk +--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2009-04-14 17:54:35.000000000 +0100 @@ -58,17 +58,17 @@ ifeq ($(PLATFORM), linux) @@ -22,9 +23,10 @@ endif ifneq ("$(findstring sparc,$(ARCH))", "") # sparc or sparcv9 ---- openjdk/corba/make/common/shared/Compiler-gcc.gmk~ 2008-01-14 14:05:43.738465508 +0100 -+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2008-01-14 14:19:33.640984398 +0100 -@@ -58,17 +58,17 @@ +diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-14 17:54:35.000000000 +0100 +@@ -54,17 +54,17 @@ ifeq ($(PLATFORM), linux) # Settings specific to Linux @@ -44,5 +46,5 @@ - CXX = $(COMPILER_PATH)g++ + CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) endif - ifneq ("$(findstring sparc,$(ARCH))", "") - # sparc or sparcv9 + # Option used to create a shared library + SHARED_LIBRARY_FLAG = -shared -mimpure-text
--- a/patches/icedtea-java2d-dasher.patch Fri Mar 20 11:57:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java.orig 2009-01-13 12:14:53.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java 2009-01-13 12:15:09.000000000 -0500 -@@ -120,7 +120,7 @@ - - // Normalize so 0 <= phase < dash[0] - int idx = 0; -- dashOn = false; -+ dashOn = true; - int d; - while (phase >= (d = dash[idx])) { - phase -= d;
--- a/patches/icedtea-jscheme.patch Fri Mar 20 11:57:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1262 +0,0 @@ -diff -Nru openjdk.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk/corba/make/com/sun/corba/se/sources/Makefile ---- openjdk.orig/corba/make/com/sun/corba/se/sources/Makefile 2008-08-14 08:39:29.000000000 +0100 -+++ openjdk/corba/make/com/sun/corba/se/sources/Makefile 2008-08-20 22:48:47.000000000 +0100 -@@ -80,11 +80,11 @@ - POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc - UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc - --MC_GENERATE_CLASS = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class --MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource -+MC_GENERATE_CLASS = make-class -+MC_GENERATE_LOG_RB = make-resource - --JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_CLASS) --JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_LOG_RB) -+JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) -+JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) - - - # -diff -Nru openjdk.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk/corba/make/sun/rmi/corbalogsources/Makefile ---- openjdk.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-08-14 08:39:29.000000000 +0100 -+++ openjdk/corba/make/sun/rmi/corbalogsources/Makefile 2008-08-20 22:48:47.000000000 +0100 -@@ -75,15 +75,14 @@ - POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc - UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc - --MC_GENERATE_CLASS = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class --MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource -+MC_GENERATE_CLASS = make-class -+MC_GENERATE_LOG_RB = make-resource - --JSCHEME_LIB_DIRECTORY=$(SRC_DIR)/com/sun/tools/corba/se/logutil/lib --JSCHEME_CLASSPATH=$(JSCHEME_LIB_DIRECTORY)/jscheme.jar$(CLASSPATH_SEPARATOR)$(JSCHEME_LIB_DIRECTORY)/jschemelogutil.jar --JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) \ -- -cp "$(JSCHEME_CLASSPATH)" jscheme.REPL $(MC_GENERATE_CLASS) --JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \ -- -cp "$(JSCHEME_CLASSPATH)" jscheme.REPL $(MC_GENERATE_LOG_RB) -+MC_CLASSPATH=$(BUILDTOOLJARDIR)/MC.jar -+MCJ_GENERATE_CLASS = $(BOOT_JAVA_CMD) \ -+ -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) -+MCJ_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \ -+ -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) - - - # -@@ -104,28 +103,28 @@ - $(MKDIR) -p $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC) -- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC) -- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC) -- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC) -- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC) -- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC) -- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC) -- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC) -- $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY) - - logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties - -@@ -142,28 +141,28 @@ - $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties - - $(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY) - - $(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC) -- $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY) -+ $(MCJ_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY) - - - # -diff -Nru openjdk.orig/corba/make/tools/logutil/Makefile openjdk/corba/make/tools/logutil/Makefile ---- openjdk.orig/corba/make/tools/logutil/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/corba/make/tools/logutil/Makefile 2008-08-20 22:48:47.000000000 +0100 -@@ -0,0 +1,43 @@ -+# -+# Copyright 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. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+ -+# -+# Makefile for building the idlj tool -+# -+ -+BUILDDIR = ../.. -+PACKAGE = com.sun.tools.corba.se.logutil -+PRODUCT = tools -+PROGRAM = MC -+include $(BUILDDIR)/common/Defs.gmk -+ -+BUILDTOOL_SOURCE_ROOT = $(SHARE_SRC)/classes -+BUILDTOOL_MAIN = $(PKGDIR)/MC.java -+ -+# -+# Build tool jar rules. -+# -+include $(BUILDDIR)/common/BuildToolJar.gmk -+ -diff -Nru openjdk.orig/corba/make/tools/Makefile openjdk/corba/make/tools/Makefile ---- openjdk.orig/corba/make/tools/Makefile 2008-08-14 08:39:29.000000000 +0100 -+++ openjdk/corba/make/tools/Makefile 2008-08-20 22:48:47.000000000 +0100 -@@ -33,6 +33,7 @@ - SUBDIRS = \ - strip_properties \ - idlj \ -+ logutil \ - - all build clean clobber:: - $(SUBDIRS-loop) -diff -Nru openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java ---- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java 2008-08-14 08:39:32.000000000 +0100 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java 2008-08-20 22:48:47.000000000 +0100 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 2003, 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 -@@ -30,7 +30,6 @@ - import java.io.OutputStream ; - import java.io.BufferedWriter ; - import java.io.OutputStreamWriter ; --import jsint.Pair ; - import java.util.StringTokenizer ; - - public class IndentingPrintWriter extends PrintWriter { -@@ -38,22 +37,20 @@ - private int indentWidth = 4 ; - private String indentString = "" ; - -- public void printMsg( String msg, Pair data ) -+ public void printMsg( String msg, Object... data ) - { - // System.out.println( "printMsg called with msg=" + msg + " data=" + data ) ; - StringTokenizer st = new StringTokenizer( msg, "@", true ) ; - StringBuffer result = new StringBuffer() ; -- Object head = data.first ; -- Pair tail = (Pair)data.rest ; - String token = null ; -+ int pos = 0; - - while (st.hasMoreTokens()) { - token = st.nextToken() ; - if (token.equals("@")) { -- if (head != null) { -- result.append( head ) ; -- head = tail.first ; -- tail = (Pair)tail.rest ; -+ if (pos < data.length) { -+ result.append( data[pos] ) ; -+ ++pos; - } else { - throw new Error( "List too short for message" ) ; - } -diff -Nru openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java ---- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java 2008-08-20 22:48:47.000000000 +0100 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ */ -+package com.sun.tools.corba.se.logutil; -+ -+public class InputCode { -+ -+ /** -+ * The name of this code. -+ */ -+ private final String name; -+ -+ /** -+ * The code. -+ */ -+ private final int code; -+ -+ /** -+ * The log level for this code. -+ */ -+ private final String logLevel; -+ -+ /** -+ * The error message for this code. -+ */ -+ private final String message; -+ -+ /** -+ * Creates a new error code with the specified name, code, -+ * log level and error message. -+ * -+ * @param name the name of the new code. -+ * @param code the code itself. -+ * @param logLevel the level of severity of this error. -+ * @param message the error message for this code. -+ */ -+ public InputCode(final String name, final int code, -+ final String logLevel, final String message) { -+ this.name = name; -+ this.code = code; -+ this.logLevel = logLevel; -+ this.message = message; -+ } -+ -+ /** -+ * Returns the name of this code. -+ * -+ * @return the name of the code. -+ */ -+ public String getName() { -+ return name; -+ } -+ -+ /** -+ * Returns the code. -+ * -+ * @return the code. -+ */ -+ public int getCode() { -+ return code; -+ } -+ -+ /** -+ * Returns the severity of this code. -+ * -+ * @return the log level severity of the code. -+ */ -+ public String getLogLevel() { -+ return logLevel; -+ } -+ -+ /** -+ * Returns the error message for this code. -+ * -+ * @return the error message for this code. -+ */ -+ public String getMessage() { -+ return message; -+ } -+ -+ /** -+ * Returns a textual representation of this code. -+ * -+ * @return a textual representation. -+ */ -+ public String toString() { -+ return getClass().getName() + -+ "[name=" + name + -+ ",code=" + code + -+ ",logLevel=" + logLevel + -+ ",message=" + message + -+ "]"; -+ } -+ -+} -diff -Nru openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java ---- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java 2008-08-20 22:48:47.000000000 +0100 -@@ -0,0 +1,95 @@ -+/* -+ * Copyright 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ */ -+package com.sun.tools.corba.se.logutil; -+ -+import java.util.LinkedList; -+import java.util.Queue; -+ -+public class InputException { -+ -+ /** -+ * The name of this exception. -+ */ -+ private final String name; -+ -+ /** -+ * The codes associated with this exception. -+ */ -+ private final Queue<InputCode> codes; -+ -+ /** -+ * Constructs a new {@link InputException} with the -+ * specified name. -+ * -+ * @param name the name of the new exception; -+ */ -+ public InputException(final String name) { -+ this.name = name; -+ codes = new LinkedList<InputCode>(); -+ } -+ -+ /** -+ * Adds a new code to this exception. -+ * -+ * @param c the code to add. -+ */ -+ public void add(InputCode c) -+ { -+ codes.offer(c); -+ } -+ -+ /** -+ * Returns the name of this exception. -+ * -+ * @return the exception's name. -+ */ -+ public String getName() { -+ return name; -+ } -+ -+ /** -+ * Returns the codes associated with this exception. -+ * -+ * @return the exception's codes. -+ */ -+ public Queue<InputCode> getCodes() { -+ return codes; -+ } -+ -+ /** -+ * Returns a textual representation of this exception. -+ * -+ * @return a textual representation. -+ */ -+ public String toString() { -+ return getClass().getName() -+ + "[name=" + name -+ + ",codes=" + codes -+ + "]"; -+ } -+ -+ -+} -+ -diff -Nru openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java ---- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java 2008-08-20 22:48:47.000000000 +0100 -@@ -0,0 +1,211 @@ -+/* -+ * Copyright 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ */ -+ -+package com.sun.tools.corba.se.logutil; -+ -+import java.io.BufferedReader; -+import java.io.File; -+import java.io.FileInputStream; -+import java.io.FileNotFoundException; -+import java.io.InputStreamReader; -+import java.io.IOException; -+ -+import java.util.LinkedList; -+import java.util.Queue; -+ -+import java.util.regex.Matcher; -+import java.util.regex.Pattern; -+ -+public class Input { -+ -+ /** -+ * The name of the package this class will inhabit. -+ */ -+ private String packageName; -+ -+ /** -+ * The name of the generated class. -+ */ -+ private String className; -+ -+ /** -+ * The name of the group of exceptions handled by the class. -+ */ -+ private String groupName; -+ -+ /** -+ * The group of exceptions. -+ */ -+ private Queue<InputException> exceptions; -+ -+ /** -+ * Represents the current state of parsing the input. -+ */ -+ private enum State -+ { -+ OUTER, -+ IN_CLASS, -+ IN_EXCEPTION_LIST -+ }; -+ -+ /** -+ * Regular expression to match each code line. -+ */ -+ private static final Pattern EXCEPTION_INFO_REGEX = -+ Pattern.compile("(\\w+)\\s*(\\d+)\\s*(\\w+)"); -+ -+ /** -+ * Parses the specified file to create a new {@link Input} -+ * object. -+ * -+ * @param filename the file to parse. -+ * @throws FileNotFoundException if the file can't be found. -+ * @throws IOException if an I/O error occurs. -+ */ -+ public Input(final String filename) -+ throws FileNotFoundException, IOException { -+ BufferedReader r = -+ new BufferedReader(new InputStreamReader(new FileInputStream(filename))); -+ State state = State.OUTER; -+ InputException current = null; -+ exceptions = new LinkedList<InputException>(); -+ String line; -+ while ((line = r.readLine()) != null) { -+ // Skip ; comments -+ if (line.startsWith(";")) -+ continue; -+ -+ int index = line.indexOf("("); -+ if (index == -1) -+ continue; -+ -+ switch (state) { -+ case OUTER: -+ state = State.IN_CLASS; -+ String[] classInfo = line.substring(index).split(" "); -+ packageName = classInfo[0].substring(2, classInfo[0].length() - 1); -+ className = classInfo[1].substring(1, classInfo[1].length() - 1); -+ groupName = classInfo[2]; -+ break; -+ case IN_CLASS: -+ state = State.IN_EXCEPTION_LIST; -+ break; -+ case IN_EXCEPTION_LIST: -+ boolean inQuote = false; -+ boolean inCode = false; -+ boolean end = false; -+ int start = index + 1; -+ Queue<String> lines = new LinkedList<String>(); -+ for (int a = start; a < line.length(); ++a) { -+ if (line.charAt(a) == '(' && !inCode && !inQuote) { -+ if (current == null) -+ current = -+ new InputException(line.substring(start, a).trim()); -+ start = a + 1; -+ inCode = true; -+ } -+ if (line.charAt(a) == '"') -+ inQuote = !inQuote; -+ if (line.charAt(a) == ')' && !inQuote) { -+ if (inCode) { -+ lines.offer(line.substring(start, a)); -+ inCode = false; -+ } else -+ end = true; -+ } -+ if (!end && a == line.length() - 1) -+ line += r.readLine(); -+ } -+ for (String l : lines) { -+ int stringStart = l.indexOf("\"") + 1; -+ int stringEnd = l.indexOf("\"", stringStart); -+ Matcher matcher = EXCEPTION_INFO_REGEX.matcher(l.substring(0, stringStart)); -+ if (matcher.find()) -+ current.add(new InputCode(matcher.group(1), -+ Integer.parseInt(matcher.group(2)), -+ matcher.group(3), -+ l.substring(stringStart, stringEnd))); -+ } -+ exceptions.offer(current); -+ current = null; -+ break; -+ } -+ } -+ } -+ -+ /** -+ * Returns the name of this group of exceptions. -+ * -+ * @return the name of this group of exceptions. -+ */ -+ public String getGroupName() -+ { -+ return groupName; -+ } -+ -+ /** -+ * Returns the name of the package this class will go in. -+ * -+ * @return the name of the package. -+ */ -+ public String getPackageName() -+ { -+ return packageName; -+ } -+ -+ /** -+ * Returns the name of the generated class. -+ * -+ * @return the name of the class. -+ */ -+ public String getClassName() -+ { -+ return className; -+ } -+ -+ /** -+ * Returns the exceptions contained in this class. -+ * -+ * @return the exceptions. -+ */ -+ public Queue<InputException> getExceptions() { -+ return exceptions; -+ } -+ -+ /** -+ * Returns a textual representation of this input. -+ * -+ * @return a textual representation. -+ */ -+ public String toString() { -+ return getClass().getName() + -+ "[packageName=" + packageName + -+ ",className=" + className + -+ ",groupName=" + groupName + -+ ",exceptions=" + exceptions + -+ "]"; -+ } -+ -+} -diff -Nru openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java ---- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java 2008-08-20 22:48:47.000000000 +0100 -@@ -0,0 +1,559 @@ -+/* -+ * Copyright 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ */ -+package com.sun.tools.corba.se.logutil; -+ -+import java.io.File; -+import java.io.FileNotFoundException; -+import java.io.FileOutputStream; -+import java.io.IOException; -+ -+import java.util.Arrays; -+import java.util.Date; -+import java.util.Formatter; -+import java.util.List; -+import java.util.Queue; -+ -+public class MC { -+ -+ private static final String VERSION = "1.0"; -+ -+ private static final List<String> SUN_EXCEPTION_GROUPS = Arrays.asList(new String[] -+ { "SUNBASE", "ORBUTIL", "ACTIVATION", "NAMING", "INTERCEPTORS", "POA", "IOR", "UTIL" }); -+ -+ private static final List<String> EXCEPTIONS = Arrays.asList(new String[] -+ { "UNKNOWN", "BAD_PARAM", "NO_MEMORY", "IMP_LIMIT", "COMM_FAILURE", "INV_OBJREF", "NO_PERMISSION", -+ "INTERNAL", "MARSHAL", "INITIALIZE", "NO_IMPLEMENT", "BAD_TYPECODE", "BAD_OPERATION", "NO_RESOURCES", -+ "NO_RESPONSE", "PERSIST_STORE", "BAD_INV_ORDER", "TRANSIENT", "FREE_MEM", "INV_IDENT", "INV_FLAG", -+ "INTF_REPOS", "BAD_CONTEXT", "OBJ_ADAPTER", "DATA_CONVERSION", "OBJECT_NOT_EXIST", "TRANSACTION_REQUIRED", -+ "TRANSACTION_ROLLEDBACK", "INVALID_TRANSACTION", "INV_POLICY", "CODESET_INCOMPATIBLE", "REBIND", -+ "TIMEOUT", "TRANSACTION_UNAVAILABLE", "BAD_QOS", "INVALID_ACTIVITY", "ACTIVITY_COMPLETED", -+ "ACTIVITY_REQUIRED" }); -+ -+ /** -+ * Read the minor codes from the input file and -+ * write out a resource file. -+ * -+ * @param inFile the file to read the codes from. -+ * @param outDir the directory to write the resource file to. -+ * @throws FileNotFoundException if the input file can not be found. -+ * @throws IOException if an I/O error occurs. -+ */ -+ private void makeResource(String inFile, String outDir) -+ throws FileNotFoundException, IOException { -+ writeResource(outDir, new Input(inFile)); -+ } -+ -+ /** -+ * Create a new Java source file using the specified Scheme input file, -+ * and writing the result to the given output directory. -+ * -+ * @param inFile the file to read the data from. -+ * @param outDir the directory to write the Java class to. -+ * @throws FileNotFoundException if the input file can not be found. -+ * @throws IOException if an I/O error occurs. -+ */ -+ private void makeClass(String inFile, String outDir) -+ throws FileNotFoundException, IOException { -+ writeClass(inFile, outDir, new Input(inFile)); -+ } -+ -+ /** -+ * Writes out a Java source file using the data from the given -+ * {@link Input} object. The result is written to {@code outDir}. -+ * The name of the input file is just used in the header of the -+ * resulting source file. -+ * -+ * @param inFile the name of the file the data was read from. -+ * @param outDir the directory to write the Java class to. -+ * @param input the parsed input data. -+ * @throws FileNotFoundException if the output file can't be written. -+ */ -+ private void writeClass(String inFile, String outDir, Input input) -+ throws FileNotFoundException { -+ String packageName = input.getPackageName(); -+ String className = input.getClassName(); -+ String groupName = input.getGroupName(); -+ Queue<InputException> exceptions = input.getExceptions(); -+ FileOutputStream file = new FileOutputStream(outDir + File.separator + className + ".java"); -+ IndentingPrintWriter pw = new IndentingPrintWriter(file); -+ -+ writeClassHeader(inFile, groupName, pw); -+ pw.printMsg("package @ ;", packageName); -+ pw.println(); -+ pw.println("import java.util.logging.Logger ;"); -+ pw.println("import java.util.logging.Level ;"); -+ pw.println(); -+ pw.println("import org.omg.CORBA.OMGVMCID ;"); -+ pw.println( "import com.sun.corba.se.impl.util.SUNVMCID ;"); -+ pw.println( "import org.omg.CORBA.CompletionStatus ;"); -+ pw.println( "import org.omg.CORBA.SystemException ;"); -+ pw.println(); -+ pw.println( "import com.sun.corba.se.spi.orb.ORB ;"); -+ pw.println(); -+ pw.println( "import com.sun.corba.se.spi.logging.LogWrapperFactory;"); -+ pw.println(); -+ pw.println( "import com.sun.corba.se.spi.logging.LogWrapperBase;"); -+ pw.println(); -+ writeImports(exceptions, pw); -+ pw.println(); -+ pw.indent(); -+ pw.printMsg("public class @ extends LogWrapperBase {", className); -+ pw.println(); -+ pw.printMsg("public @( Logger logger )", className); -+ pw.indent(); -+ pw.println( "{"); -+ pw.undent(); -+ pw.println( "super( logger ) ;"); -+ pw.println( "}"); -+ pw.println(); -+ pw.flush(); -+ writeFactoryMethod(className, groupName, pw); -+ writeExceptions(groupName, exceptions, className, pw); -+ pw.undent(); -+ pw.println( ); -+ pw.println( "}"); -+ pw.flush(); -+ pw.close(); -+ } -+ -+ /** -+ * Writes out the header of a Java source file. -+ * -+ * @param inFile the input file the file was generated from. -+ * @param groupName the group of exceptions the Java source file is for. -+ * @param pw the print writer used to write the output. -+ */ -+ private void writeClassHeader(String inFile, String groupName, -+ IndentingPrintWriter pw) { -+ if (groupName.equals("OMG")) -+ pw.println("// Log wrapper class for standard exceptions"); -+ else -+ pw.printMsg("// Log wrapper class for Sun private system exceptions in group @", -+ groupName); -+ pw.println("//"); -+ pw.printMsg("// Generated by MC.java version @, DO NOT EDIT BY HAND!", VERSION); -+ pw.printMsg("// Generated from input file @ on @", inFile, new Date()); -+ pw.println(); -+ } -+ -+ /** -+ * Write out the import list for the exceptions. -+ * -+ * @param groups the exceptions that were parsed. -+ * @param pw the {@link IndentingPrintWriter} for writing to the file. -+ */ -+ private void writeImports(Queue<InputException> exceptions, -+ IndentingPrintWriter pw) { -+ if (exceptions == null) -+ return; -+ for (InputException e : exceptions) -+ pw.println("import org.omg.CORBA." + e.getName() + " ;"); -+ } -+ -+ /** -+ * Write out the factory method for this group of exceptions. -+ * -+ * @param className the name of the generated class. -+ * @param groupName the name of this group of exceptions. -+ * @param pw the {@link IndentingPrintWriter} for writing to the file. -+ */ -+ private void writeFactoryMethod(String className, String groupName, -+ IndentingPrintWriter pw) { -+ pw.indent(); -+ pw.println( "private static LogWrapperFactory factory = new LogWrapperFactory() {"); -+ pw.println( "public LogWrapperBase create( Logger logger )" ); -+ pw.indent(); -+ pw.println( "{"); -+ pw.undent(); -+ pw.printMsg("return new @( logger ) ;", className); -+ pw.undent(); -+ pw.println( "}" ); -+ pw.println( "} ;" ); -+ pw.println(); -+ pw.printMsg("public static @ get( ORB orb, String logDomain )", className); -+ pw.indent(); -+ pw.println( "{"); -+ pw.indent(); -+ pw.printMsg( "@ wrapper = ", className); -+ pw.indent(); -+ pw.printMsg( "(@) orb.getLogWrapper( logDomain, ", className); -+ pw.undent(); -+ pw.undent(); -+ pw.printMsg( "\"@\", factory ) ;", groupName); -+ pw.undent(); -+ pw.println( "return wrapper ;" ); -+ pw.println( "} " ); -+ pw.println(); -+ pw.printMsg( "public static @ get( String logDomain )", className); -+ pw.indent(); -+ pw.println( "{"); -+ pw.indent(); -+ pw.printMsg( "@ wrapper = ", className); -+ pw.indent(); -+ pw.printMsg( "(@) ORB.staticGetLogWrapper( logDomain, ", className); -+ pw.undent(); -+ pw.undent(); -+ pw.printMsg( "\"@\", factory ) ;", groupName); -+ pw.undent(); -+ pw.println( "return wrapper ;" ); -+ pw.println( "} " ); -+ pw.println(); -+ } -+ -+ /** -+ * Writes out the exceptions themselves. -+ * -+ * @param groupName the name of this group of exceptions. -+ * @param exceptions the exceptions to write out. -+ * @param className the name of the generated class. -+ * @param pw the {@link IndentingPrintWriter} for writing to the file. -+ */ -+ private void writeExceptions(String groupName, Queue<InputException> exceptions, -+ String className, IndentingPrintWriter pw) { -+ for (InputException e : exceptions) { -+ pw.println("///////////////////////////////////////////////////////////"); -+ pw.printMsg("// @", e.getName()); -+ pw.println("///////////////////////////////////////////////////////////"); -+ pw.println(); -+ for (InputCode c : e.getCodes()) -+ writeMethods(groupName, e.getName(), c.getName(), c.getCode(), -+ c.getLogLevel(), className, StringUtil.countArgs(c.getMessage()), pw); -+ pw.flush(); -+ } -+ } -+ -+ /** -+ * Writes out the methods for a particular error. -+ * -+ * @param groupName the name of this group of exceptions. -+ * @param exceptionName the name of this particular exception. -+ * @param errorName the name of this particular error. -+ * @param code the minor code for this particular error. -+ * @param ident the name of the error in mixed-case identifier form. -+ * @param level the level at which to place log messages. -+ * @param className the name of the class for this group of exceptions. -+ * @param numParams the number of parameters the detail message takes. -+ * @param pw the print writer for writing to the file. -+ */ -+ private void writeMethods(String groupName, String exceptionName, String errorName, -+ int code, String level, String className, int numParams, -+ IndentingPrintWriter pw) { -+ String ident = StringUtil.toMixedCase(errorName); -+ pw.printMsg("public static final int @ = @ ;", errorName, getBase(groupName, code)); -+ pw.println(); -+ pw.flush(); -+ writeMethodStatusCause(groupName, exceptionName, errorName, ident, level, -+ numParams, className, pw); -+ pw.println(); -+ pw.flush(); -+ writeMethodStatus(exceptionName, ident, numParams, pw); -+ pw.println(); -+ pw.flush(); -+ writeMethodCause(exceptionName, ident, numParams, pw); -+ pw.println(); -+ pw.flush(); -+ writeMethodNoArgs(exceptionName, ident, numParams, pw); -+ pw.println(); -+ pw.flush(); -+ } -+ -+ /** -+ * Writes out a method for an error that takes a -+ * {@link org.omg.CORBA.CompletionStatus} and a cause. -+ * -+ * @param groupName the name of this group of exceptions. -+ * @param exceptionName the name of this particular exception. -+ * @param errorName the name of this particular error. -+ * @param ident the name of the error in mixed-case identifier form. -+ * @param logLevel the level at which to place log messages. -+ * @param numParams the number of parameters the detail message takes. -+ * @param className the name of the class for this group of exceptions. -+ * @param pw the print writer for writing to the file. -+ */ -+ private void writeMethodStatusCause(String groupName, String exceptionName, -+ String errorName, String ident, -+ String logLevel, int numParams, -+ String className, IndentingPrintWriter pw) { -+ pw.indent(); -+ pw.printMsg( "public @ @( CompletionStatus cs, Throwable t@) {", exceptionName, -+ ident, makeDeclArgs(true, numParams)); -+ pw.printMsg( "@ exc = new @( @, cs ) ;", exceptionName, exceptionName, errorName); -+ pw.indent(); -+ pw.println( "if (t != null)" ); -+ pw.undent(); -+ pw.println( "exc.initCause( t ) ;" ); -+ pw.println(); -+ pw.indent(); -+ pw.printMsg( "if (logger.isLoggable( Level.@ )) {", logLevel); -+ if (numParams > 0) { -+ pw.printMsg( "Object[] parameters = new Object[@] ;", numParams); -+ for (int a = 0; a < numParams; ++a) -+ pw.printMsg("parameters[@] = arg@ ;", a, a); -+ } else -+ pw.println( "Object[] parameters = null ;"); -+ pw.indent(); -+ pw.printMsg( "doLog( Level.@, \"@.@\",", logLevel, groupName, ident); -+ pw.undent(); -+ pw.undent(); -+ pw.printMsg( "parameters, @.class, exc ) ;", className); -+ pw.println( "}"); -+ pw.println(); -+ -+ pw.undent(); -+ pw.println( "return exc ;"); -+ pw.println( "}"); -+ } -+ -+ /** -+ * Writes out a method for an error that takes a -+ * {@link org.omg.CORBA.CompletionStatus}. -+ * -+ * @param exceptionName the name of this particular exception. -+ * @param ident the name of the error in mixed-case identifier form. -+ * @param numParams the number of parameters the detail message takes. -+ * @param pw the print writer for writing to the file. -+ */ -+ private void writeMethodStatus(String exceptionName, String ident, -+ int numParams, IndentingPrintWriter pw) { -+ pw.indent(); -+ pw.printMsg("public @ @( CompletionStatus cs@) {", exceptionName, -+ ident, makeDeclArgs(true, numParams)); -+ pw.undent(); -+ pw.printMsg("return @( cs, null@ ) ;", ident, makeCallArgs(true, numParams)); -+ pw.println("}"); -+ } -+ -+ /** -+ * Writes out a method for an error that takes a cause. -+ * -+ * @param exceptionName the name of this particular exception. -+ * @param ident the name of the error in mixed-case identifier form. -+ * @param numParams the number of parameters the detail message takes. -+ * @param pw the print writer for writing to the file. -+ */ -+ private void writeMethodCause(String exceptionName, String ident, -+ int numParams, IndentingPrintWriter pw) { -+ pw.indent(); -+ pw.printMsg("public @ @( Throwable t@) {", exceptionName, ident, -+ makeDeclArgs(true, numParams)); -+ pw.undent(); -+ pw.printMsg("return @( CompletionStatus.COMPLETED_NO, t@ ) ;", ident, -+ makeCallArgs(true, numParams)); -+ pw.println("}"); -+ } -+ -+ /** -+ * Writes out a method for an error that takes no arguments. -+ * -+ * @param exceptionName the name of this particular exception. -+ * @param ident the name of the error in mixed-case identifier form. -+ * @param numParams the number of parameters the detail message takes. -+ * @param pw the print writer for writing to the file. -+ */ -+ private void writeMethodNoArgs(String exceptionName, String ident, -+ int numParams, IndentingPrintWriter pw) { -+ -+ pw.indent(); -+ pw.printMsg("public @ @( @) {", exceptionName, ident, -+ makeDeclArgs(false, numParams)); -+ pw.undent(); -+ pw.printMsg("return @( CompletionStatus.COMPLETED_NO, null@ ) ;", -+ ident, makeCallArgs(true, numParams)); -+ pw.println("}"); -+ } -+ -+ /** -+ * Returns a list of comma-separated arguments with type declarations. -+ * -+ * @param leadingComma true if the list should start with a comma. -+ * @param numArgs the number of arguments to generate. -+ * @return the generated string. -+ */ -+ private String makeDeclArgs(boolean leadingComma, int numArgs) { -+ return makeArgString("Object arg", leadingComma, numArgs); -+ } -+ -+ /** -+ * Returns a list of comma-separated arguments without type declarations. -+ * -+ * @param leadingComma true if the list should start with a comma. -+ * @param numArgs the number of arguments to generate. -+ * @return the generated string. -+ */ -+ private String makeCallArgs(boolean leadingComma, int numArgs) { -+ return makeArgString("arg", leadingComma, numArgs); -+ } -+ -+ /** -+ * Returns a list of comma-separated arguments. -+ * -+ * @param prefixString the string with which to prefix each argument. -+ * @param leadingComma true if the list should start with a comma. -+ * @param numArgs the number of arguments to generate. -+ * @return the generated string. -+ */ -+ private String makeArgString(String prefixString, boolean leadingComma, -+ int numArgs) { -+ if (numArgs == 0) -+ return " "; -+ if (numArgs == 1) { -+ if (leadingComma) -+ return ", " + prefixString + (numArgs - 1); -+ else -+ return " " + prefixString + (numArgs - 1); -+ } -+ return makeArgString(prefixString, leadingComma, numArgs - 1) + -+ ", " + prefixString + (numArgs - 1); -+ } -+ -+ /** -+ * Returns the {@link String} containing the calculation of the -+ * error code. -+ * -+ * @param groupName the group of exception to which the code belongs. -+ * @param code the minor code number representing the exception within the group. -+ * @return the unique error code. -+ */ -+ private String getBase(String groupName, int code) { -+ if (groupName.equals("OMG")) -+ return "OMGVMCID.value + " + code; -+ else -+ return "SUNVMCID.value + " + (code + getSunBaseNumber(groupName)); -+ } -+ -+ /** -+ * Returns the base number for Sun-specific exceptions. -+ * -+ * @return the base number. -+ */ -+ private int getSunBaseNumber(String groupName) { -+ return 200 * SUN_EXCEPTION_GROUPS.indexOf(groupName); -+ } -+ -+ /** -+ * Writes out a resource file using the data from the given -+ * {@link Input} object. The result is written to {@code outDir}. -+ * -+ * @param outDir the directory to write the Java class to. -+ * @param input the parsed input data. -+ * @throws FileNotFoundException if the output file can't be written. -+ */ -+ private void writeResource(String outDir, Input input) -+ throws FileNotFoundException { -+ FileOutputStream file = new FileOutputStream(outDir + File.separator + -+ input.getClassName() + ".resource"); -+ IndentingPrintWriter pw = new IndentingPrintWriter(file); -+ String groupName = input.getGroupName(); -+ for (InputException e : input.getExceptions()) { -+ String exName = e.getName(); -+ for (InputCode c : e.getCodes()) { -+ String ident = StringUtil.toMixedCase(c.getName()); -+ pw.printMsg("@.@=\"@: (@) @\"", groupName, ident, -+ getMessageID(groupName, exName, c.getCode()), exName, c.getMessage()); -+ } -+ pw.flush(); -+ } -+ pw.close(); -+ } -+ -+ /** -+ * Returns the message ID corresponding to the given group name, -+ * exception name and error code. -+ * -+ * @param groupName the name of the group of exceptions. -+ * @param exception the name of the particular exception. -+ * @param code an error code from the given exception. -+ * @return the message ID. -+ */ -+ private String getMessageID(String groupName, String exceptionName, int code) { -+ if (groupName.equals("OMG")) -+ return getStandardMessageID(exceptionName, code); -+ else -+ return getSunMessageID(groupName, exceptionName, code); -+ } -+ -+ /** -+ * Returns the standard (OMG) message ID corresponding to the given -+ * exception name and error code. -+ * -+ * @param exceptionName the name of the particular exception. -+ * @param code an error code from the given exception. -+ * @return the message ID. -+ */ -+ private String getStandardMessageID(String exceptionName, int code) { -+ return new Formatter().format("IOP%s0%04d", getExceptionID(exceptionName), -+ code).toString(); -+ } -+ -+ /** -+ * Returns the Sun message ID corresponding to the given group name, -+ * exception name and error code. -+ * -+ * @param groupName the name of the group of exceptions. -+ * @param exceptionName the name of the particular exception. -+ * @param code an error code from the given exception. -+ * @return the message ID. -+ */ -+ private String getSunMessageID(String groupName, String exceptionName, int code) { -+ return new Formatter().format("IOP%s1%04d", getExceptionID(exceptionName), -+ getSunBaseNumber(groupName) + code).toString(); -+ } -+ -+ /** -+ * Returns the exception ID corresponding to the given exception name. -+ * -+ * @param exceptionName the name of the particular exception. -+ * @return the message ID. -+ */ -+ private String getExceptionID(String exceptionName) { -+ return new Formatter().format("%03d", EXCEPTIONS.indexOf(exceptionName)).toString(); -+ } -+ -+ /** -+ * Entry point for running the generator from the command -+ * line. Users can specify either "make-class" or "make-resource" -+ * as the first argument to generate the specified type of file. -+ * -+ * @param args the command-line arguments. -+ * @throws FileNotFoundException if the input file can not be found. -+ * @throws IOException if an I/O error occurs. -+ */ -+ public static void main(String[] args) -+ throws FileNotFoundException, IOException -+ { -+ if (args.length < 3) -+ { -+ System.err.println("(make-class|make-resource) <input file> <output dir>"); -+ System.exit(-1); -+ } -+ if (args[0].equals("make-class")) -+ new MC().makeClass(args[1], args[2]); -+ else if (args[0].equals("make-resource")) -+ new MC().makeResource(args[1], args[2]); -+ else -+ System.err.println("Invalid command: " + args[0]); -+ } -+ -+} -diff -Nru openjdk.orig/jdk/THIRD_PARTY_README openjdk/jdk/THIRD_PARTY_README ---- openjdk.orig/jdk/THIRD_PARTY_README 2008-08-14 08:42:48.000000000 +0100 -+++ openjdk/jdk/THIRD_PARTY_README 2008-08-20 22:49:23.000000000 +0100 -@@ -116,17 +116,6 @@ - ____________________________________ - This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy@w3.org. - --%% This notice is provided with respect to jscheme.jar, which may be included with this software: --Software License Agreement --Copyright © 1998-2002 by Peter Norvig. --Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions: --1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose. --2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software. --3.The origin of this software must not be misrepresented, either by explicit claim or by omission. --4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license). --If you find this software useful, it would be nice if you let me (peter@norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so. -- -- - %% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software: - - Copyright (c) 1999-2004 David Corcoran -diff -Nru openjdk.orig/THIRD_PARTY_README openjdk/THIRD_PARTY_README ---- openjdk.orig/THIRD_PARTY_README 2008-08-14 08:39:21.000000000 +0100 -+++ openjdk/THIRD_PARTY_README 2008-08-20 22:49:32.000000000 +0100 -@@ -116,17 +116,6 @@ - ____________________________________ - This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy@w3.org. - --%% This notice is provided with respect to jscheme.jar, which may be included with this software: --Software License Agreement --Copyright © 1998-2002 by Peter Norvig. --Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions: --1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose. --2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software. --3.The origin of this software must not be misrepresented, either by explicit claim or by omission. --4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license). --If you find this software useful, it would be nice if you let me (peter@norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so. -- -- - %% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software: - - Copyright (c) 1999-2004 David Corcoran
--- a/patches/icedtea-libraries.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-libraries.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-02-19 08:43:08.000000000 +0000 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-04-14 18:26:05.000000000 +0100 @@ -75,12 +75,10 @@ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -32,8 +32,8 @@ endif #LINUX endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk.orig/jdk/make/common/Program.gmk 2009-02-19 08:43:09.000000000 +0000 -+++ openjdk/jdk/make/common/Program.gmk 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/common/Program.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/common/Program.gmk 2009-04-14 18:26:05.000000000 +0100 @@ -85,7 +85,7 @@ endif endif @@ -52,8 +52,8 @@ # this may not be necessary... ifeq ($(PLATFORM), windows) diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile ---- openjdk.orig/jdk/make/java/jli/Makefile 2009-02-19 08:43:09.000000000 +0000 -+++ openjdk/jdk/make/java/jli/Makefile 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/java/jli/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/java/jli/Makefile 2009-04-14 18:26:05.000000000 +0100 @@ -44,8 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -104,8 +104,8 @@ -vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk ---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2009-02-19 08:43:09.000000000 +0000 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2009-04-14 18:26:05.000000000 +0100 @@ -30,15 +30,4 @@ Inflater.c \ ZipFile.c \ @@ -123,8 +123,8 @@ - inffast.c \ zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile ---- openjdk.orig/jdk/make/java/zip/Makefile 2009-02-19 08:43:09.000000000 +0000 -+++ openjdk/jdk/make/java/zip/Makefile 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/java/zip/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/java/zip/Makefile 2009-04-14 18:26:05.000000000 +0100 @@ -30,8 +30,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -153,8 +153,8 @@ -OTHER_LDLIBS = $(JVMLIB) +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2009-02-19 08:43:10.000000000 +0000 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2009-04-14 18:26:05.000000000 +0100 @@ -25,51 +25,7 @@ FILES_c = \ @@ -209,8 +209,8 @@ ifndef OPENJDK FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile ---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-02-19 08:43:10.000000000 +0000 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2009-04-14 18:26:05.000000000 +0100 @@ -67,6 +67,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -221,8 +221,8 @@ # Add to ambient vpath to get files in a subdirectory # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2009-02-19 08:43:10.000000000 +0000 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2009-04-14 18:26:05.000000000 +0100 @@ -30,81 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -307,8 +307,8 @@ + splashscreen_sys.c diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile ---- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-02-19 08:43:10.000000000 +0000 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-04-14 18:26:05.000000000 +0100 @@ -59,12 +59,12 @@ # C Flags # @@ -340,8 +340,8 @@ # Shun the less than portable MMX assembly code in pnggccrd.c, # and use alternative implementations in C. diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-02-19 08:43:45.000000000 +0000 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-04-14 16:44:27.000000000 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-04-14 18:26:05.000000000 +0100 @@ -87,11 +87,7 @@ // bytes and byte arrays @@ -355,8 +355,8 @@ typedef LONGLONG jlong; typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2009-04-14 18:26:05.000000000 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -367,8 +367,8 @@ #include "java_util_zip_Adler32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2009-04-14 18:26:05.000000000 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -379,8 +379,8 @@ #include "java_util_zip_CRC32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2009-04-14 18:26:05.000000000 +0100 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -391,8 +391,8 @@ #include "java_util_zip_Deflater.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2009-04-14 18:26:05.000000000 +0100 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -403,8 +403,8 @@ #define ThrowDataFormatException(env, msg) \ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2009-04-14 18:26:05.000000000 +0100 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -416,8 +416,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-04-14 18:26:05.000000000 +0100 @@ -51,7 +51,9 @@ /* headers from the JPEG library */ @@ -570,7 +570,7 @@ } huff_ptr = comp->ac_huff_tbl_ptrs[i]; } -@@ -1337,6 +1395,8 @@ +@@ -1356,6 +1414,8 @@ jclass ImageInputStreamClass, jclass qTableClass, jclass huffClass) { @@ -579,7 +579,7 @@ ImageInputStream_readID = (*env)->GetMethodID(env, ImageInputStreamClass, -@@ -1422,7 +1482,7 @@ +@@ -1441,7 +1501,7 @@ } /* We set up the normal JPEG error routines, then override error_exit. */ @@ -588,7 +588,7 @@ jerr->pub.error_exit = sun_jpeg_error_exit; /* We need to setup our own print routines */ jerr->pub.output_message = sun_jpeg_output_message; -@@ -1439,11 +1499,11 @@ +@@ -1458,11 +1518,11 @@ } /* Perform library initialization */ @@ -602,7 +602,7 @@ /* * Now set up our source. -@@ -1461,7 +1521,7 @@ +@@ -1480,7 +1540,7 @@ cinfo->src->init_source = imageio_init_source; cinfo->src->fill_input_buffer = imageio_fill_input_buffer; cinfo->src->skip_input_data = imageio_skip_input_data; @@ -611,7 +611,7 @@ cinfo->src->term_source = imageio_term_source; /* set up the association to persist for future calls */ -@@ -1579,7 +1639,7 @@ +@@ -1599,7 +1659,7 @@ src->bytes_in_buffer = 0; } @@ -620,16 +620,16 @@ if (ret == JPEG_HEADER_TABLES_ONLY) { retval = JNI_TRUE; -@@ -1700,7 +1760,7 @@ +@@ -1728,7 +1788,7 @@ cinfo->num_components, - read_icc_profile(env, cinfo)); + profileData); if (reset) { - jpeg_abort_decompress(cinfo); + jpegabortdecompress(cinfo); } } -@@ -1896,7 +1956,7 @@ +@@ -1924,7 +1984,7 @@ TRUE); } @@ -638,7 +638,7 @@ if (progressive) { cinfo->buffered_image = TRUE; cinfo->input_scan_number = minProgressivePass+1; // Java count from 0 -@@ -1908,7 +1968,7 @@ +@@ -1936,7 +1996,7 @@ data->streamBuf.suspendable = FALSE; @@ -647,7 +647,7 @@ // loop over progressive passes done = FALSE; -@@ -1916,7 +1976,7 @@ +@@ -1944,7 +2004,7 @@ if (progressive) { // initialize the next pass. Note that this skips up to // the first interesting pass. @@ -656,7 +656,7 @@ if (wantUpdates) { (*env)->CallVoidMethod(env, this, JPEGImageReader_passStartedID, -@@ -1932,7 +1992,7 @@ +@@ -1960,7 +2020,7 @@ // Skip until the first interesting line while ((data->abortFlag == JNI_FALSE) && ((jint)cinfo->output_scanline < sourceYStart)) { @@ -665,7 +665,7 @@ } scanlineLimit = sourceYStart+sourceHeight; -@@ -1945,7 +2005,7 @@ +@@ -1973,7 +2033,7 @@ while ((data->abortFlag == JNI_FALSE) && ((jint)cinfo->output_scanline < scanlineLimit)) { @@ -674,7 +674,7 @@ // Now mangle it into our buffer out = data->pixelBuf.buf.bp; -@@ -1993,13 +2053,13 @@ +@@ -2021,13 +2081,13 @@ skipLines = linesLeft; } for(i = 0; i < skipLines; i++) { @@ -691,7 +691,7 @@ || (cinfo->input_scan_number > maxProgressivePass)) { done = TRUE; } -@@ -2019,9 +2079,9 @@ +@@ -2047,9 +2107,9 @@ if (cinfo->output_scanline == cinfo->output_height) { // if ((cinfo->output_scanline == cinfo->output_height) && //(jpeg_input_complete(cinfo))) { // We read the whole file @@ -703,7 +703,7 @@ } free(scanLinePtr); -@@ -2067,7 +2127,7 @@ +@@ -2095,7 +2155,7 @@ cinfo = (j_decompress_ptr) data->jpegObj; @@ -712,7 +712,7 @@ } -@@ -2273,6 +2333,142 @@ +@@ -2301,6 +2361,142 @@ /********************** end of destination manager ************/ @@ -855,7 +855,7 @@ /********************** Writer JNI calls **********************/ -@@ -2284,6 +2480,8 @@ +@@ -2312,6 +2508,8 @@ jclass qTableClass, jclass huffClass) { @@ -864,7 +864,7 @@ ImageOutputStream_writeID = (*env)->GetMethodID(env, IOSClass, "write", -@@ -2357,7 +2555,7 @@ +@@ -2385,7 +2583,7 @@ } /* We set up the normal JPEG error routines, then override error_exit. */ @@ -873,7 +873,7 @@ jerr->pub.error_exit = sun_jpeg_error_exit; /* We need to setup our own print routines */ jerr->pub.output_message = sun_jpeg_output_message; -@@ -2374,7 +2572,7 @@ +@@ -2402,7 +2600,7 @@ } /* Perform library initialization */ @@ -882,7 +882,7 @@ /* Now set up the destination */ dest = malloc(sizeof(struct jpeg_destination_mgr)); -@@ -2483,7 +2681,7 @@ +@@ -2511,7 +2709,7 @@ return; } @@ -891,7 +891,7 @@ data->streamBuf.suspendable = FALSE; if (qtables != NULL) { -@@ -2498,7 +2696,7 @@ +@@ -2526,7 +2724,7 @@ DCHuffmanTables, ACHuffmanTables, TRUE); } @@ -900,7 +900,7 @@ RELEASE_ARRAYS(env, data, NULL); } -@@ -2662,9 +2860,9 @@ +@@ -2690,9 +2888,9 @@ cinfo->input_components = numBands; cinfo->in_color_space = inCs; @@ -912,7 +912,7 @@ cinfo->optimize_coding = optimize; -@@ -2701,7 +2899,7 @@ +@@ -2729,7 +2927,7 @@ (*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT); @@ -921,7 +921,7 @@ qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT); -@@ -2726,7 +2924,7 @@ +@@ -2754,7 +2952,7 @@ if (progressive) { if (numScans == 0) { // then use default scans @@ -930,7 +930,7 @@ } else { cinfo->num_scans = numScans; // Copy the scanInfo to a local array -@@ -2768,7 +2966,7 @@ +@@ -2796,7 +2994,7 @@ #endif // start the compressor; tables must already be set @@ -939,7 +939,7 @@ if (haveMetadata) { // Flush the buffer -@@ -2829,7 +3027,7 @@ +@@ -2857,7 +3055,7 @@ } } // write it out @@ -948,7 +948,7 @@ targetLine += stepY; } -@@ -2838,9 +3036,9 @@ +@@ -2866,9 +3064,9 @@ * so use jpeg_abort instead of jpeg_finish_compress. */ if (cinfo->next_scanline == cinfo->image_height) { @@ -961,7 +961,7 @@ if (scale != NULL) { diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,284 +0,0 @@ -/* @@ -1249,7 +1249,7 @@ - */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -/* @@ -1418,7 +1418,7 @@ - return lines_per_iMCU_row; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,453 +0,0 @@ -/* @@ -1875,7 +1875,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,462 +0,0 @@ -/* @@ -2341,7 +2341,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,391 +0,0 @@ -/* @@ -2736,7 +2736,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,913 +0,0 @@ -/* @@ -3653,7 +3653,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/* @@ -3708,7 +3708,7 @@ -EXTERN(void) jpeg_gen_optimal_table - JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -/* @@ -3788,7 +3788,7 @@ - (*cinfo->marker->write_file_header) (cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ -/* @@ -4089,7 +4089,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,682 +0,0 @@ -/* @@ -4775,7 +4775,7 @@ - marker->last_restart_interval = 0; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,594 +0,0 @@ -/* @@ -5373,7 +5373,7 @@ - master->total_passes = cinfo->num_scans; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -/* @@ -5487,7 +5487,7 @@ - return tbl; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -/* jconfig.cfg --- source file edited by configure script */ @@ -5534,7 +5534,7 @@ - -#endif /* JPEG_CJPEG_DJPEG */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,614 +0,0 @@ -/* @@ -6152,7 +6152,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,837 +0,0 @@ -/* @@ -6993,7 +6993,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,358 +0,0 @@ -/* @@ -7355,7 +7355,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,523 +0,0 @@ -/* @@ -7882,7 +7882,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,392 +0,0 @@ -/* @@ -8278,7 +8278,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,399 +0,0 @@ -/* @@ -8681,7 +8681,7 @@ - return TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,279 +0,0 @@ -/* @@ -8964,7 +8964,7 @@ - -#endif /* D_MULTISCAN_FILES_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,740 +0,0 @@ -/* @@ -9708,7 +9708,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,398 +0,0 @@ -/* @@ -10110,7 +10110,7 @@ - cinfo->output_components = cinfo->out_color_components; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ -/* @@ -10294,7 +10294,7 @@ -#define MULTIPLY16V16(var1,var2) ((var1) * (var2)) -#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,273 +0,0 @@ -/* @@ -10571,7 +10571,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,655 +0,0 @@ -/* @@ -11230,7 +11230,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -/* @@ -11439,7 +11439,7 @@ - JPP((bitread_working_state * state, register bit_buf_type get_buffer, - register int bits_left, d_derived_tbl * htbl, int min_bits)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -/* @@ -11828,7 +11828,7 @@ - inputctl->inheaders = TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,516 +0,0 @@ -/* @@ -12348,7 +12348,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1384 +0,0 @@ -/* @@ -13736,7 +13736,7 @@ - ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,561 +0,0 @@ -/* @@ -14301,7 +14301,7 @@ - master_selection(cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,404 +0,0 @@ -/* @@ -14709,7 +14709,7 @@ - -#endif /* UPSAMPLE_MERGING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,672 +0,0 @@ -/* @@ -15385,7 +15385,7 @@ - -#endif /* D_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,294 +0,0 @@ -/* @@ -15683,7 +15683,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,482 +0,0 @@ -/* @@ -16169,7 +16169,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -/* @@ -16320,7 +16320,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,272 +0,0 @@ -/* @@ -16596,7 +16596,7 @@ - return err; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,295 +0,0 @@ -/* @@ -16895,7 +16895,7 @@ - -#endif /* JERROR_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -/* @@ -17071,7 +17071,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,228 +0,0 @@ -/* @@ -17303,7 +17303,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,287 +0,0 @@ -/* @@ -17594,7 +17594,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,246 +0,0 @@ -/* @@ -17844,7 +17844,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,372 +0,0 @@ -/* @@ -18220,7 +18220,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,393 +0,0 @@ -/* @@ -18617,7 +18617,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,402 +0,0 @@ -/* @@ -19023,7 +19023,7 @@ - -#endif /* IDCT_SCALING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -/* @@ -19122,7 +19122,7 @@ -#define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1122 +0,0 @@ -/* @@ -20248,7 +20248,7 @@ - -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -/* @@ -20365,7 +20365,7 @@ - /* no work */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,202 +0,0 @@ -/* @@ -20571,7 +20571,7 @@ -EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo)); -EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,375 +0,0 @@ -/* @@ -20950,8 +20950,8 @@ - -#endif /* JPEG_INTERNAL_OPTIONS */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-02-19 08:43:46.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-04-14 18:26:05.000000000 +0100 @@ -45,7 +45,9 @@ #undef boolean #undef FAR @@ -21206,7 +21206,7 @@ /* After finish_decompress, we can close the input file. * Here we postpone it until after no more JPEG errors are possible, diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,396 +0,0 @@ -/* @@ -21606,7 +21606,7 @@ -#endif -#endif /* INCOMPLETE_TYPES_BROKEN */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,1100 +0,0 @@ -/* @@ -22710,7 +22710,7 @@ - -#endif /* JPEGLIB_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,860 +0,0 @@ -/* @@ -23574,7 +23574,7 @@ - -#endif /* QUANT_1PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1314 +0,0 @@ -/* @@ -24892,7 +24892,7 @@ - -#endif /* QUANT_2PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -/* @@ -25079,7 +25079,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -/* @@ -25101,7 +25101,7 @@ - -#define JCOPYRIGHT "Copyright (C) 1998, Thomas G. Lane" diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README openjdk/jdk/src/share/native/sun/awt/image/jpeg/README ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2009-02-19 08:43:46.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2009-03-20 11:58:43.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -The Independent JPEG Group's JPEG software @@ -25490,8 +25490,8 @@ - -Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net. diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-02-19 08:43:47.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-04-14 18:26:05.000000000 +0100 @@ -26,7 +26,7 @@ #include "splashscreen_impl.h" #include "splashscreen_gfx.h" @@ -25502,8 +25502,8 @@ #define GIF_TRANSPARENT 0x01 #define GIF_USER_INPUT 0x02 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-02-19 08:43:47.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-04-14 18:26:05.000000000 +0100 @@ -25,9 +25,8 @@ #include "splashscreen_impl.h" @@ -25534,8 +25534,8 @@ src = (stream_src_ptr) cinfo->src; diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-02-19 08:43:47.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-02-20 19:01:23.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-04-14 16:44:27.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-04-14 18:26:05.000000000 +0100 @@ -25,7 +25,7 @@ #include "splashscreen_impl.h"
--- a/patches/icedtea-linker-libs-order.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-linker-libs-order.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-01-27 00:55:08.000000000 +0000 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-01-27 01:18:13.000000000 +0000 +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-04-15 18:50:47.000000000 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-04-15 18:59:31.000000000 +0100 @@ -75,12 +75,12 @@ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -40,21 +40,9 @@ ifdef MT $(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif -diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-01-22 08:46:11.000000000 +0000 -+++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-01-27 01:16:47.000000000 +0000 -@@ -1343,7 +1343,7 @@ - ifdef ALSA_VERSION_CHECK - $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c - @$(prep-target) -- @$(CC) -lasound -o $@ $< -+ @$(CC) -o $@ $< -lasound - - $(ALSA_VERSION_CHECK).c: - @$(prep-target) diff -Nru openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile ---- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-01-22 08:46:12.000000000 +0000 -+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-01-27 01:16:47.000000000 +0000 +--- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-04-15 18:59:31.000000000 +0100 @@ -65,7 +65,7 @@ $(MIDIFILES_export) \ $(PORTFILES_export)
--- a/patches/icedtea-snmp.patch Fri Mar 20 11:57:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,235 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile ---- openjdk.orig/jdk/make/com/sun/jmx/Makefile 2008-11-11 01:22:14.000000000 +0000 -+++ openjdk/jdk/make/com/sun/jmx/Makefile 2008-11-11 01:24:31.000000000 +0000 -@@ -41,7 +41,7 @@ - # Note : some targets are double colon rules and some single colon rules - # within common included gmk files : that is why the following for loop - # has been duplicated. --SUBDIRS = snmp -+SUBDIRS = - - all build: - $(SUBDIRS-loop) -diff -Nru openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile openjdk/jdk/make/com/sun/jmx/snmp/Makefile ---- openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile 2008-11-11 01:22:23.000000000 +0000 -+++ openjdk/jdk/make/com/sun/jmx/snmp/Makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,45 +0,0 @@ --# --# Copyright 2003-2005 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. Sun designates this --# particular file as subject to the "Classpath" exception as provided --# by Sun in the LICENSE file that accompanied this code. --# --# 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. --# -- --# --# Makefile for building SNMP runtime support for --# Sun-specific JDK out of the box management support. --# -- --BUILDDIR = ../../../.. --PACKAGE = com.sun.jmx.snmp --PRODUCT = sun --include $(BUILDDIR)/common/Defs.gmk -- --# --# Files to compile --# --AUTO_FILES_JAVA_DIRS = com/sun/jmx/snmp -- --# --# Rules --# --include $(BUILDDIR)/common/Classes.gmk -- -diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2008-11-11 01:23:00.000000000 +0000 -+++ openjdk/jdk/make/docs/Makefile 2008-11-11 01:26:08.000000000 +0000 -@@ -328,14 +328,8 @@ - MGMT_DOCDIR = $(DOCSDIR)/jre/api/management/ - MGMT_EXT_DIR = $(MGMT_DOCDIR)/extension - MGMT_SOURCEPATH = $(TOPDIR)/src/share/classes --JVM_MIB_NAME = JVM-MANAGEMENT-MIB.mib --JVM_MIB_SRC = $(CLOSED_SRC)/share/classes/sun/management/snmp/$(JVM_MIB_NAME) - --ifdef OPENJDK -- COPY-MIB-TARGET = --else -- COPY-MIB-TARGET = copy-mib --endif -+COPY-MIB-TARGET = - MGMT_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ - -encoding ascii \ - -nodeprecatedlist \ -@@ -632,12 +626,6 @@ - $(JAVADOC_CMD) $(MGMT_JAVADOCFLAGS) \ - $(MGMT_PKGS) - --copy-mib: -- @# ######## copy-snmp-mib ############################ -- $(RM) $(MGMT_DOCDIR)/$(JVM_MIB_NAME) -- $(MKDIR) -p $(MGMT_DOCDIR) -- $(CP) $(JVM_MIB_SRC) $(MGMT_DOCDIR) -- - .PHONY: attachdocs - attachdocs: - @# ######## api-attach ############################ -diff -Nru openjdk.orig/jdk/make/sun/management/Makefile openjdk/jdk/make/sun/management/Makefile ---- openjdk.orig/jdk/make/sun/management/Makefile 2008-11-11 01:22:47.000000000 +0000 -+++ openjdk/jdk/make/sun/management/Makefile 2008-11-11 01:25:00.000000000 +0000 -@@ -33,26 +33,20 @@ - MGMT_LIBDIR = $(LIBDIR)/management - MGMT_LIB_SRC = $(SHARE_SRC)/lib/management - --all build:: properties aclfile jmxremotefiles -+all build:: properties jmxremotefiles - --SUBDIRS = snmp jmxremote -+SUBDIRS = jmxremote - all build clean clobber:: - $(SUBDIRS-loop) - - properties: $(MGMT_LIBDIR)/management.properties - --aclfile: $(MGMT_LIBDIR)/snmp.acl.template -- - jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxremote.access - - $(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties - $(install-file) - $(CHMOD) 644 $@ - --$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template -- $(install-file) -- $(CHMOD) 444 $@ -- - $(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template - $(install-file) - $(CHMOD) 444 $@ -diff -Nru openjdk.orig/jdk/make/sun/management/snmp/Makefile openjdk/jdk/make/sun/management/snmp/Makefile ---- openjdk.orig/jdk/make/sun/management/snmp/Makefile 2008-11-11 01:22:41.000000000 +0000 -+++ openjdk/jdk/make/sun/management/snmp/Makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,44 +0,0 @@ --# --# Copyright 2003-2005 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. Sun designates this --# particular file as subject to the "Classpath" exception as provided --# by Sun in the LICENSE file that accompanied this code. --# --# 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. --# -- --# --# Makefile for building SNMP MIB instrumentation --# -- --BUILDDIR = ../../.. --PACKAGE = sun.management.snmp --PRODUCT = sun --include $(BUILDDIR)/common/Defs.gmk -- --# --# Files to compile --# --AUTO_FILES_JAVA_DIRS = sun/management/snmp -- --# --# Rules --# --include $(BUILDDIR)/common/Classes.gmk -- -diff -Nru openjdk.orig/jdk/src/share/classes/sun/management/Agent.java openjdk/jdk/src/share/classes/sun/management/Agent.java ---- openjdk.orig/jdk/src/share/classes/sun/management/Agent.java 2008-11-11 01:45:39.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/management/Agent.java 2008-11-11 01:46:56.000000000 +0000 -@@ -41,15 +41,13 @@ - - import javax.management.remote.JMXConnectorServer; - --import sun.management.snmp.AdaptorBootstrap; - import sun.management.jmxremote.ConnectorBootstrap; - import static sun.management.AgentConfigurationError.*; - import sun.misc.VMSupport; - - /** -- * This Agent is started by the VM when -Dcom.sun.management.snmp -- * or -Dcom.sun.management.jmxremote is set. This class will be -- * loaded by the system class loader. -+ * This Agent is started by the VM when -Dcom.sun.management.jmxremote -+ * is set. This class will be loaded by the system class loader. - */ - public class Agent { - // management properties -@@ -58,8 +56,6 @@ - - private static final String CONFIG_FILE = - "com.sun.management.config.file"; -- private static final String SNMP_PORT = -- "com.sun.management.snmp.port"; - private static final String JMXREMOTE = - "com.sun.management.jmxremote"; - private static final String JMXREMOTE_PORT = -@@ -114,7 +110,6 @@ - } - - private static void startAgent(Properties props) throws Exception { -- String snmpPort = props.getProperty(SNMP_PORT); - String jmxremote = props.getProperty(JMXREMOTE); - String jmxremotePort = props.getProperty(JMXREMOTE_PORT); - -@@ -127,10 +122,6 @@ - } - - try { -- if (snmpPort != null) { -- AdaptorBootstrap.initialize(snmpPort, props); -- } -- - /* - * If the jmxremote.port property is set then we start the - * RMIConnectorServer for remote M&M. -@@ -190,11 +181,10 @@ - public static synchronized Properties getManagementProperties() { - if (mgmtProps == null) { - String configFile = System.getProperty(CONFIG_FILE); -- String snmpPort = System.getProperty(SNMP_PORT); - String jmxremote = System.getProperty(JMXREMOTE); - String jmxremotePort = System.getProperty(JMXREMOTE_PORT); - -- if (configFile == null && snmpPort == null && -+ if (configFile == null && - jmxremote == null && jmxremotePort == null) { - // return if out-of-the-management option is not specified - return null;
--- a/patches/icedtea-tests-jdk.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-tests-jdk.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,88 +1,3 @@ -diff -Nru openjdk.orig/jdk/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java openjdk/jdk/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java ---- openjdk.orig/jdk/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java 2008-11-14 21:11:49.000000000 +0000 -+++ openjdk/jdk/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java 2008-11-14 21:15:27.000000000 +0000 -@@ -118,7 +118,7 @@ - public boolean handlesWheelScrolling(){return true;}; - public void createBuffers(int numBuffers, BufferCapabilities caps) throws AWTException{}; - public Image getBackBuffer(){return null;}; -- public void flip(BufferCapabilities.FlipContents flipAction){}; -+ public void flip(int x1, int y1, int x2, int y2, BufferCapabilities.FlipContents flipAction){}; - public void destroyBuffers(){}; - - /** -diff -Nru openjdk.orig/jdk/test/java/awt/EventQueue/6638195/bug6638195.java openjdk/jdk/test/java/awt/EventQueue/6638195/bug6638195.java ---- openjdk.orig/jdk/test/java/awt/EventQueue/6638195/bug6638195.java 2008-11-14 21:16:51.000000000 +0000 -+++ openjdk/jdk/test/java/awt/EventQueue/6638195/bug6638195.java 2008-11-14 21:21:40.000000000 +0000 -@@ -76,9 +76,12 @@ - Callable<Void> afterDispatchCallable = - new Callable<Void>() { - public Void call() { -+ try { - delegate.afterDispatch(afterDispatchEventArgument[0], - afterDispatchHandleArgument[0]); -- return null; -+ } -+ catch (InterruptedException e) {} -+ return null; - } - }; - methodMap = new HashMap<String, Object>(); -@@ -91,8 +94,11 @@ - Callable<Object> beforeDispatchCallable = - new Callable<Object>() { - public Object call() { -+ try { - return delegate.beforeDispatch( - beforeDispatchEventArgument[0]); -+ } -+ catch (InterruptedException e) { return null; } - } - }; - methodMap = new HashMap<String, Object>(); -diff -Nru openjdk.orig/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java openjdk/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java ---- openjdk.orig/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java 2008-11-14 21:23:20.000000000 +0000 -+++ openjdk/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java 2008-11-16 00:54:46.000000000 +0000 -@@ -36,6 +36,7 @@ - */ - - import java.io.IOException; -+import java.net.ProtocolFamily; - import java.net.Socket; - import java.nio.channels.Channel; - import java.nio.channels.DatagramChannel; -@@ -137,6 +138,10 @@ - return provider.openDatagramChannel(); - } - -+ public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException { -+ return provider.openDatagramChannel(family); -+ } -+ - public Pipe openPipe() throws IOException { - return provider.openPipe(); - } -diff -Nru openjdk.orig/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java openjdk/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java ---- openjdk.orig/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2008-11-14 22:50:49.000000000 +0000 -+++ openjdk/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2008-11-16 00:54:56.000000000 +0000 -@@ -35,6 +35,7 @@ - import java.io.IOException; - import java.net.InetAddress; - import java.net.InetSocketAddress; -+import java.net.ProtocolFamily; - import java.net.ServerSocket; - import java.nio.channels.*; - import java.nio.channels.spi.*; -@@ -126,6 +127,10 @@ - return provider.openDatagramChannel(); - } - -+ public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException { -+ return provider.openDatagramChannel(family); -+ } -+ - public Pipe openPipe() - throws IOException - { diff -Nru openjdk.orig/jdk/test/javax/print/attribute/PSCopiesFlavorTest.java openjdk/jdk/test/javax/print/attribute/PSCopiesFlavorTest.java --- openjdk.orig/jdk/test/javax/print/attribute/PSCopiesFlavorTest.java 2008-11-14 04:33:18.000000000 +0000 +++ openjdk/jdk/test/javax/print/attribute/PSCopiesFlavorTest.java 2008-11-14 23:09:15.000000000 +0000
--- a/patches/icedtea-uname.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-uname.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,27 +1,6 @@ ---- openjdk/jdk/make/common/shared/Platform.gmk.orig 2008-10-27 11:44:47.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-10-27 11:52:17.000000000 +0100 -@@ -191,6 +191,9 @@ - OS_VERSION := $(shell uname -r) - # Arch and OS name/version - mach := $(shell uname -m) -+ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) -+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') -+ endif - archExpr = case "$(mach)" in \ - i[3-9]86) \ - echo i586 \ -@@ -204,6 +207,9 @@ - sparc*) \ - echo sparc \ - ;; \ -+ arm*) \ -+ echo arm \ -+ ;; \ - *) \ - echo $(mach) \ - ;; \ ---- openjdk/corba/make/common/shared/Platform.gmk.orig 2008-10-27 11:44:47.000000000 +0100 -+++ openjdk/corba/make/common/shared/Platform.gmk 2008-10-27 11:53:01.000000000 +0100 +diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk +--- openjdk.orig/corba/make/common/shared/Platform.gmk 2009-04-14 20:38:17.000000000 +0100 ++++ openjdk/corba/make/common/shared/Platform.gmk 2009-04-15 15:29:14.000000000 +0100 @@ -181,6 +181,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version @@ -42,3 +21,26 @@ *) \ echo $(mach) \ ;; \ +diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2009-04-14 20:38:17.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2009-04-15 15:29:14.000000000 +0100 +@@ -152,6 +152,9 @@ + PLATFORM = linux + # Arch and OS name/version + mach := $(shell uname -m) ++ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) ++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') ++ endif + archExpr = case "$(mach)" in \ + i[3-9]86) \ + echo i586 \ +@@ -165,6 +168,9 @@ + sparc*) \ + echo sparc \ + ;; \ ++ arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \
--- a/patches/icedtea-zero-build.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-zero-build.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-09-01 01:34:18.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2008-09-01 01:37:11.000000000 +0100 +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-04-14 18:31:10.000000000 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2009-04-14 20:29:27.000000000 +0100 @@ -99,8 +99,16 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 @@ -21,8 +21,8 @@ # Add in platform specific optimizations for all opt levels CC_HIGHEST_OPT += $(_OPT_$(ARCH)) diff -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2008-09-01 01:34:18.000000000 +0100 -+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2008-09-01 01:37:11.000000000 +0100 +--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2009-04-14 18:31:09.000000000 +0100 ++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2009-04-14 20:29:27.000000000 +0100 @@ -70,6 +70,11 @@ else CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) @@ -44,8 +44,8 @@ SHARED_LIBRARY_FLAG = -shared -mimpure-text SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk ---- openjdk.orig/corba/make/common/shared/Platform.gmk 2008-08-14 08:39:29.000000000 +0100 -+++ openjdk/corba/make/common/shared/Platform.gmk 2008-09-01 01:37:11.000000000 +0100 +--- openjdk.orig/corba/make/common/shared/Platform.gmk 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk/corba/make/common/shared/Platform.gmk 2009-04-14 20:29:27.000000000 +0100 @@ -202,6 +202,11 @@ ARCH_FAMILY := $(ARCH) @@ -58,10 +58,40 @@ ifeq ($(ARCH), sparc) # Linux sparc build can be either 32-bit or 64-bit. # Default to 32, but allow explicit setting to 32 or 64. +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2009-04-14 18:31:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2009-04-14 20:29:27.000000000 +0100 +@@ -98,7 +98,11 @@ + #define VMTYPE COMPILER1_PRESENT("Client") \ + COMPILER2_PRESENT("Server") + #else ++#ifdef ZERO ++ #define VMTYPE "Zero" ++#else + #define VMTYPE "Core" ++#endif // ZERO + #endif // COMPILER1 || COMPILER2 + #endif // TIERED + #endif // KERNEL +@@ -146,10 +150,14 @@ + WINDOWS_ONLY("windows") \ + SOLARIS_ONLY("solaris") + ++#ifdef ZERO ++#define CPU ZERO_LIBARCH ++#else + #define CPU IA32_ONLY("x86") \ + IA64_ONLY("ia64") \ + AMD64_ONLY("amd64") \ + SPARC_ONLY("sparc") ++#endif // ZERO + + const char *Abstract_VM_Version::vm_platform_string() { + return OS "-" CPU; diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-09-01 01:34:18.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-09-01 01:37:11.000000000 +0100 -@@ -113,8 +113,16 @@ +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-04-14 18:31:10.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2009-04-14 20:29:27.000000000 +0100 +@@ -116,8 +116,16 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 @@ -78,12 +108,12 @@ + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) +endif - # - # Selection of warning messages + # If this is a --hash-style=gnu system, use --hash-style=both + # The gnu .hash section won't work on some Linux systems like SuSE 10. diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2008-09-01 01:34:18.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-09-01 01:38:18.000000000 +0100 -@@ -68,6 +68,11 @@ +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-14 18:31:09.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-04-14 20:32:47.000000000 +0100 +@@ -66,6 +66,11 @@ else CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) endif @@ -91,22 +121,14 @@ + # zero + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* -+ else - ifneq ("$(findstring sparc,$(ARCH))", "") - # sparc or sparcv9 - REQUIRED_CC_VER = 4.0 -@@ -86,6 +91,7 @@ - endif - endif - endif + endif # Option used to create a shared library SHARED_LIBRARY_FLAG = -shared -mimpure-text SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk ---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2008-08-14 08:42:49.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-09-01 01:37:11.000000000 +0100 -@@ -208,6 +208,11 @@ +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2009-04-14 20:29:27.000000000 +0100 +@@ -173,6 +173,11 @@ ARCH_FAMILY := $(ARCH) # Linux builds may be 32-bit or 64-bit data model. @@ -119,8 +141,8 @@ # Linux sparc build can be either 32-bit or 64-bit. # Default to 32, but allow explicit setting to 32 or 64. diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk ---- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2008-08-14 08:42:49.000000000 +0100 -+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2008-09-01 01:37:11.000000000 +0100 +--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2009-04-14 20:29:27.000000000 +0100 @@ -55,21 +55,25 @@ endif # PLATFORM solaris @@ -163,8 +185,8 @@ # files needed for MIDI i/o diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2008-08-14 08:43:23.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2008-09-01 01:37:11.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-04-14 20:29:27.000000000 +0100 @@ -38,6 +38,7 @@ #define X_SPARCV9 3 #define X_IA64 4 @@ -173,32 +195,3 @@ // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly. ---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Thu Jun 19 17:05:23 2008 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Fri Jun 20 10:29:14 2008 +0100 -@@ -98,7 +98,11 @@ - #define VMTYPE COMPILER1_PRESENT("Client") \ - COMPILER2_PRESENT("Server") - #else -+#ifdef ZERO -+ #define VMTYPE "Zero" -+#else - #define VMTYPE "Core" -+#endif // ZERO - #endif // COMPILER1 || COMPILER2 - #endif // TIERED - #endif // KERNEL -@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele - WINDOWS_ONLY("windows") \ - SOLARIS_ONLY("solaris") - -+#ifdef ZERO -+#define CPU ZERO_LIBARCH -+#else - #define CPU IA32_ONLY("x86") \ - IA64_ONLY("ia64") \ - AMD64_ONLY("amd64") \ - SPARC_ONLY("sparc") -+#endif // ZERO - - const char *Abstract_VM_Version::vm_platform_string() { - return OS "-" CPU;