From mark at klomp.org Sat Mar 1 01:39:38 2008 From: mark at klomp.org (Mark Wielaard) Date: Sat, 01 Mar 2008 10:39:38 +0100 Subject: svn -> hg conversion script stopped Message-ID: <1204364378.3279.3.camel@localhost.localdomain> Hi, Now that the mercurial repo seems really up and running completely I have stopped the icedtea script that monitors and converts the old subversion repositories into our mercurial repo. For historical purposes (and some nostalgia) we will keep this repo around. It contains openjdk/jdk7 b13 till b23: http://icedtea.classpath.org/hg/openjdk/ Cheers, Mark From bugzilla-daemon at icedtea.classpath.org Sat Mar 1 10:44:41 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 01 Mar 2008 18:44:41 +0000 Subject: [Bug 111] New: Please make gcjwebplugin name and description configurable Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=111 Summary: Please make gcjwebplugin name and description configurable Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: timo.lindfors at iki.fi It would be nice if the name and description strings returned by the gcjwebplugin were configurable. Currently I have to do the following binary patching to login to the website of my bank: plugin="/usr/lib/jvm/java-7-icedtea/jre/lib/i386/gcjwebplugin.so" t="s@" t+="GCJ Web Browser Plugin (using IcedTea) 1.4" t+="@" t+="Java(TM) Plug-in 1.4.2_05" t+="@" sed -i "$t" $plugin t="s@" t+="The GCJ Web Browser Plugin (using IcedTea) executes Java applets." t+="@" t+="Java(TM) Plug-in 1.4.2_05" t+="@" sed -i "$t" $plugin since they use http://www.pinlady.net/PluginDetect/ which requires that 1) either name or description matches regexp Java.*Plug-In.*\d|\d.*Java.*Plug-In 2) and name matches also [\d][\d\.\_,-]* -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From twisti at complang.tuwien.ac.at Sun Mar 2 13:20:14 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Sun, 02 Mar 2008 22:20:14 +0100 Subject: zero now the default on ppc In-Reply-To: <20080214083028.GA3726@redhat.com> References: <20080213163220.GA5957@redhat.com> <1202931904.3977.4.camel@localhost.localdomain> <20080214083028.GA3726@redhat.com> Message-ID: <1204492814.16844.3.camel@workstation.home.at> On Thu, 2008-02-14 at 08:30 +0000, Gary Benson wrote: > Christian Thalinger wrote: > > On Wed, 2008-02-13 at 16:32 +0000, Gary Benson wrote: > > > 2) Three paths changed, from: > > > j2sdk-image/jre/lib/ppc/client/libjsig.so > > > j2sdk-image/jre/lib/ppc/client/libjvm.so > > > j2sdk-image/jre/lib/ppc/client/Xusage.txt > > > to: > > > j2sdk-image/jre/lib/ppc/core/libjsig.so > > > j2sdk-image/jre/lib/ppc/core/libjvm.so > > > j2sdk-image/jre/lib/ppc/core/Xusage.txt > > > > What is the impact of this? Does this affect the CACAO branch? > > Not sure. Where do you install your libjvm.so? Hmm, it seems it does not work: $ openjdk-ecj/build/linux-ppc/bin/java Error: no `core' JVM at `/home/twisti/cacao/sun/openjdk/icedtea-cacao-ecj/openjdk-ecj/build/linux-ppc/lib/ppc/core/libjvm.so'. This is a cacao-branch with all changesets from default transplanted and configured with: --disable-zero --with-cacao The build system only copies the libjvm.so into the client/ and server/ directories, but not into core/. Maybe it would be better to only use a jvm.cfg which lists -core KNOWN when using --enable-zero? - twisti From Paul.Hohensee at Sun.COM Sun Mar 2 18:28:39 2008 From: Paul.Hohensee at Sun.COM (Paul Hohensee) Date: Sun, 02 Mar 2008 21:28:39 -0500 Subject: Someone is doing a linux-sparc port! In-Reply-To: <47C7AB77.6040603@Sun.COM> References: <47C7AB77.6040603@Sun.COM> Message-ID: <47CB6257.7060609@sun.com> Sun has a prototype linux-sparc hotspot port that we've been waiting for the openjdk repositories to open up to post. Last time I tried to build it, 32-bit worked fine, but 64-bit died with some sort of build machine library incompatibility. Anyway, it'll be posted soon, but it's quite definitely unsupported by Sun, etc. If there's enough interest (read, money), Sun might consider supporting it at some future time. I'll post a note as soon as we push it. Paul > -------- Original Message -------- > Subject: icedtea7 no linux-sparc? > Date: Fri, 29 Feb 2008 02:10:01 +0100 > From: Wim V > Reply-To: wim at pizzastop.be > Organization: PizzaStop > To: distro-pkg-dev at openjdk.java.net > > > > Dear Matthias, > > > > > > I ?m trying to build Icedtea7 on ubuntu hardy - sparc64. > > I?ve come to the point where all ant builds complete successfully. > > Then, I have the following problem (full output pasted below) : > > make[6]: *** No rule to make target > `/data/newtea/icedtea/openjdk-ecj/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.ad', > > needed by `../generated/adfiles/linux_sparc.ad'. Stop. > > > > I found that there is no ?linux_sparc? directory under > `/data/newtea/icedtea/openjdk-ecj/hotspot/src/os_cpu/? > However sparc is under cpu and linux is under os. > Can a target be added for os_cpu/linux_sparc/vm/linux_sparc.ad? > How do I do this? > > > > > > > > > > make[2]: Entering directory > `/data/newtea/icedtea/openjdk-ecj/hotspot/make' > > Makefile:329: target `/Xusage.txt' given more than once in the same rule. > > cd /data/newtea/icedtea/openjdk-ecj/hotspot/make; \ > > make VM_TARGET=product generic_build2 > ALT_OUTPUTDIR=/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir > > > make[3]: Entering directory > `/data/newtea/icedtea/openjdk-ecj/hotspot/make' > > Makefile:329: target `/Xusage.txt' given more than once in the same rule. > > mkdir -p > /data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir > > cd > /data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir; \ > > make -f > /data/newtea/icedtea/openjdk-ecj/hotspot/build/linux/Makefile \ > > JAVA_HOME=/data/newtea/icedtea/bootstrap/jdk1.6.0 > GAMMADIR=/data/newtea/icedtea/openjdk-ecj/hotspot MAKE_VERBOSE=y > HOTSPOT_RELEASE_VERSION=1.7.0-b24 JRE_RELEASE_VERSION=1.7.0-b24 > HOTSPOT_BUILD_VERSION= product > > make[4]: Entering directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir' > > cd linux_sparc_compiler2/product && make -w > > make[5]: Entering directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product' > > > make[6]: Entering directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product' > > > make[6]: *** No rule to make target > `/data/newtea/icedtea/openjdk-ecj/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.ad', > > needed by `../generated/adfiles/linux_sparc.ad'. Stop. > > make[6]: Leaving directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product' > > > make[5]: *** [ad_stuff] Error 2 > > make[5]: Leaving directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product' > > > make[4]: *** [product] Error 2 > > make[4]: Leaving directory > `/data/newtea/icedtea/openjdk-ecj/build/linux-sparc/hotspot/outputdir' > > make[3]: *** [generic_build2] Error 2 > > make[3]: Leaving directory > `/data/newtea/icedtea/openjdk-ecj/hotspot/make' > > make[2]: *** [product] Error 2 > > make[2]: Leaving directory > `/data/newtea/icedtea/openjdk-ecj/hotspot/make' > > make[1]: *** [hotspot-build] Error 2 > > make[1]: Leaving directory `/data/newtea/icedtea/openjdk-ecj' > > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > root at sunfire:/data/newtea/icedtea# > From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 18:59:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 02:59:43 +0000 Subject: [Bug 112] New: Stendhal jar crashes with unexpected error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=112 Summary: Stendhal jar crashes with unexpected error Product: IcedTea Version: unspecified Platform: PC URL: http://arianne.sourceforge.net/?arianne_url=games/game_s tendhal OS/Version: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: benjo316 at hotpop.com stendhal-0.67.jar (most recent version as of writing) crashes upon opening with the following output(Some/most of the beginning is probably output from the jar itself.): >super at nobu-desktop:~/bin/stendhal$ java -jar stendhal-0.67.jar >Self build client, starting without update .jar-files >Configuring Log4J using data/conf/log4j.properties >INFO [main] stendhal.java ( 89) - Setting base at :/stendhal/ >INFO [main] stendhal.java ( 90) - Stendhal 0.67 >INFO [main] stendhal.java ( 97) - OS: Linux 2.6.24-11-generic amd64 >INFO [main] stendhal.java ( 100) - Java-Runtime: IcedTea Runtime Environment 1.7.0-b24 from /usr/lib/jvm/java-7-icedtea/jre >INFO [main] stendhal.java ( 103) - Java-VM: Sun Microsystems Inc. IcedTea 64-Bit Server VM 1.7.0-b24 >INFO [main] SoundSystem.java ( 500) - Sound driver: dmix:0 [default](Direct Audio Device: dmix:0, dmix:0, dmix:0) >ERROR [main] AudioClip.java ( 85) - format is not >supported(PCM_UNSIGNED 22050.0 Hz, 8 bit, stereo, 2 bytes/frame, ) >ERROR [main] AudioClip.java ( 85) - format is not >supported(PCM_SIGNED 22050.0 Hz, 16 bit, stereo, 4 bytes/frame, little-endian) >ERROR [main] AudioClip.java ( 85) - format is not >supported(PCM_SIGNED 11025.0 Hz, 16 bit, stereo, 4 bytes/frame, little-endian) >ERROR [main] AudioClip.java ( 85) - format is not >supported(PCM_UNSIGNED 22050.0 Hz, 8 bit, stereo, 2 bytes/frame, ) >INFO [main] SoundSystem.java ( 411) - Stendhal Soundsystem OK: 131 >samples approved / 131 loaded / 65 library sounds ># ># An unexpected error has been detected by Java Runtime Environment: ># ># SIGSEGV (0xb) at pc=0x00007f76939f6141, pid=25218, tid=1087240528 ># ># Java VM: IcedTea 64-Bit Server VM (1.7.0-b24 mixed mode linux-amd64) ># Problematic frame: ># V [libjvm.so+0x5ca141] ># ># An error report file with more information is saved as: ># /home/super/bin/stendhal/hs_err_pid25218.log ># ># If you would like to submit a bug report, please visit: ># http://icedtea.classpath.org/bugzilla ># >Aborted (core dumped) IcedTea version: >super at nobu-desktop:~/bin/stendhal$ java -version >java version "1.7.0" >IcedTea Runtime Environment (build 1.7.0-b24) >IcedTea 64-Bit Server VM (build 1.7.0-b24, mixed mode) `uname -a` >Linux nobu-desktop 2.6.24-11-generic #1 SMP Fri Feb 29 21:26:31 UTC 2008 x86_64 GNU/Linux -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 19:01:03 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 03:01:03 +0000 Subject: [Bug 112] Stendhal jar crashes with unexpected error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=112 ------- Comment #1 from benjo316 at hotpop.com 2008-03-03 03:01 ------- Created an attachment (id=51) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=51&action=view) IcedTea Crash Log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 19:01:59 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 03:01:59 +0000 Subject: [Bug 112] Stendhal jar crashes with unexpected error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=112 benjo316 at hotpop.com changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #51 mime|application/octet-stream |text/plain type| | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 19:03:17 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 03:03:17 +0000 Subject: [Bug 112] Stendhal jar crashes with unexpected error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=112 ------- Comment #2 from benjo316 at hotpop.com 2008-03-03 03:03 ------- Created an attachment (id=52) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=52&action=view) Output of `dbg --args java stendhal-0.67.jar` -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 19:20:10 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 03:20:10 +0000 Subject: [Bug 110] Failed open NetBeans on Ubuntu 8.04 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=110 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |DUPLICATE ------- Comment #2 from langel at redhat.com 2008-03-03 03:20 ------- *** This bug has been marked as a duplicate of bug 112 *** -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Mar 2 19:20:12 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Mar 2008 03:20:12 +0000 Subject: [Bug 112] Stendhal jar crashes with unexpected error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=112 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |cleocir at centersys.com.br ------- Comment #3 from langel at redhat.com 2008-03-03 03:20 ------- *** Bug 110 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at redhat.com Mon Mar 3 03:47:21 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 03 Mar 2008 11:47:21 +0000 Subject: changeset in /hg/icedtea: 2008-03-03 Gary Benson changeset 5398c0d9a012 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5398c0d9a012 description: 2008-03-03 Gary Benson * patches/icedtea-ports.patch (hotspot/src/share/vm/runtime/mutex.hpp): Reworked. diffstat: 2 files changed, 14 insertions(+), 11 deletions(-) ChangeLog | 5 +++++ patches/icedtea-ports.patch | 20 +++++++++----------- diffs (53 lines): diff -r c4f526a28d0c -r 5398c0d9a012 ChangeLog --- a/ChangeLog Mon Mar 03 06:45:08 2008 -0500 +++ b/ChangeLog Mon Mar 03 06:47:12 2008 -0500 @@ -1,3 +1,8 @@ 2008-03-03 Gary Benson + + * patches/icedtea-ports.patch + (hotspot/src/share/vm/runtime/mutex.hpp): Reworked. + 2008-03-03 Gary Benson * patches/icedtea-ppc-stack-hack.patch: Removed. diff -r c4f526a28d0c -r 5398c0d9a012 patches/icedtea-ports.patch --- a/patches/icedtea-ports.patch Mon Mar 03 06:45:08 2008 -0500 +++ b/patches/icedtea-ports.patch Mon Mar 03 06:47:12 2008 -0500 @@ -171,28 +171,26 @@ diff -ru openjdk.orig/hotspot/src/share/ diff -ru openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp --- openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp 2007-11-08 11:34:54.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp 2007-11-08 11:36:15.000000000 +0000 -@@ -61,19 +61,15 @@ - } ; +@@ -61,18 +61,10 @@ union SplitWord { // full-word with se + } ; // Endian-ness ... index of least-significant byte in SplitWord.Bytes[] -#ifdef AMD64 // little -+#if defined(IA32) || defined(AMD64) || defined(IA64) // little ++#ifdef VM_LITTLE_ENDIAN #define _LSBINDEX 0 #else -#if IA32 // little - #define _LSBINDEX 0 -#else -#ifdef SPARC // big -+#if defined(SPARC) || defined(PPC) // big #define _LSBINDEX (sizeof(intptr_t)-1) - #else - #error "unknown architecture" +-#else +- #error "unknown architecture" +-#endif +-#endif #endif - #endif --#endif - - class ParkEvent ; - + + class ParkEvent ; diff -ru 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 2007-11-08 11:34:54.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2007-11-08 11:36:15.000000000 +0000 From gbenson at redhat.com Mon Mar 3 03:47:20 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 03 Mar 2008 11:47:20 +0000 Subject: changeset in /hg/icedtea: 2008-03-03 Gary Benson changeset c4f526a28d0c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c4f526a28d0c description: 2008-03-03 Gary Benson * patches/icedtea-ppc-stack-hack.patch: Removed. * Makefile.am (ICEDTEA_PATCHES): Removed the above. * Makefile.in: Regenerated. * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp (current_stack_region): Fudge reported stack size. diffstat: 5 files changed, 16 insertions(+), 36 deletions(-) ChangeLog | 9 +++ Makefile.am | 1 Makefile.in | 1 patches/icedtea-ppc-stack-hack.patch | 32 -------------- ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 9 +++ diffs (93 lines): diff -r 448e495b7740 -r c4f526a28d0c ChangeLog --- a/ChangeLog Fri Feb 29 11:27:35 2008 -0500 +++ b/ChangeLog Mon Mar 03 06:45:08 2008 -0500 @@ -1,3 +1,12 @@ 2008-02-29 Gary Benson + + * patches/icedtea-ppc-stack-hack.patch: Removed. + * Makefile.am (ICEDTEA_PATCHES): Removed the above. + * Makefile.in: Regenerated. + + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp + (current_stack_region): Fudge reported stack size. + 2008-02-29 Gary Benson * patches/icedtea-ppc-stack-hack.patch: More. diff -r 448e495b7740 -r c4f526a28d0c Makefile.am --- a/Makefile.am Fri Feb 29 11:27:35 2008 -0500 +++ b/Makefile.am Mon Mar 03 06:45:08 2008 -0500 @@ -281,7 +281,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-lib64.patch \ patches/icedtea-zero.patch \ patches/icedtea-freetype.patch \ - patches/icedtea-ppc-stack-hack.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(ZERO_BUILD_PATCH) \ diff -r 448e495b7740 -r c4f526a28d0c Makefile.in --- a/Makefile.in Fri Feb 29 11:27:35 2008 -0500 +++ b/Makefile.in Mon Mar 03 06:45:08 2008 -0500 @@ -376,7 +376,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-lib64.patch \ patches/icedtea-zero.patch \ patches/icedtea-freetype.patch \ - patches/icedtea-ppc-stack-hack.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(ZERO_BUILD_PATCH) \ diff -r 448e495b7740 -r c4f526a28d0c patches/icedtea-ppc-stack-hack.patch --- a/patches/icedtea-ppc-stack-hack.patch Fri Feb 29 11:27:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -diff -r 6a85c2ba896a openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Fri Feb 29 10:10:42 2008 +0000 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Fri Feb 29 10:17:34 2008 +0000 -@@ -845,7 +845,12 @@ bool os::create_thread(Thread* thread, T - } - - stack_size = MAX2(stack_size, os::Linux::min_stack_allowed); -+#ifdef PPC -+ // https://bugzilla.redhat.com/show_bug.cgi?id=435337 -+ pthread_attr_setstacksize(&attr, stack_size + 64*K); -+#else - pthread_attr_setstacksize(&attr, stack_size); -+#endif // PPC - } else { - // let pthread_create() pick the default value. - } -diff -r 536e71398adf openjdk/jdk/src/solaris/bin/java_md.c ---- openjdk/jdk/src/solaris/bin/java_md.c Fri Feb 29 11:03:05 2008 +0000 -+++ openjdk/jdk/src/solaris/bin/java_md.c Fri Feb 29 16:24:48 2008 +0000 -@@ -1254,7 +1254,12 @@ ContinueInNewThread0(int (JNICALL *conti - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); - - if (stack_size > 0) { -+#ifdef PPC -+ // https://bugzilla.redhat.com/show_bug.cgi?id=435337 -+ pthread_attr_setstacksize(&attr, stack_size + 64*K); -+#else - pthread_attr_setstacksize(&attr, stack_size); -+#endif // PPC - } - - if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) { diff -r 448e495b7740 -r c4f526a28d0c ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Feb 29 11:27:35 2008 -0500 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Mon Mar 03 06:45:08 2008 -0500 @@ -245,8 +245,13 @@ static void current_stack_region(address } pthread_attr_destroy(&attr); - - } + } + +#ifdef PPC + // https://bugzilla.redhat.com/show_bug.cgi?id=435337 + *size -= 64*K; +#endif + assert(os::current_stack_pointer() >= *bottom && os::current_stack_pointer() < *bottom + *size, "just checking"); } From jsumali at redhat.com Mon Mar 3 18:00:45 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 04 Mar 2008 02:00:45 +0000 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali changeset 7676131f9e83 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7676131f9e83 description: 2008-03-03 Joshua Sumali * Makefile.am: Updated to b06. * Makefile.in: Regenerated. * patches/icedtea-ant.patch: Updated line numbers for b06. * patches/icedtea-bytebuffer-compact.patch: Likewise. * patches/icedtea-copy-plugs.patch: Likewise. * patches/icedtea-core-build.patch: Likewise. * patches/icedtea-gcc-4.3.patch: Likewise. * patches/icedtea-headers.patch: Likewise. * patches/icedtea-lib64.patch: Likewise. * patches/icedtea-libraries.patch: Likewise. * patches/icedtea-ports.patch: Likewise. * patches/icedtea-sunsrc.patch: Likewise. * patches/icedtea-tools.patch: Likewise. * patches/icedtea-use-system-tzdata.patch: Likewise. * patches/icedtea-zero.patch: Likewise. * patches/icedtea-graphics.patch: Removed awt patches since new awt code is included in b06. * rt/java/awt/*: Removed files since they are newly opened in b06. diffstat: 45 files changed, 94 insertions(+), 10461 deletions(-) ChangeLog | 21 Makefile.am | 6 Makefile.in | 6 generated/sun/awt/X11/generator/sizer.32.c | 16 patches/icedtea-ant.patch | 2 patches/icedtea-bytebuffer-compact.patch | 4 patches/icedtea-copy-plugs.patch | 45 patches/icedtea-core-build.patch | 8 patches/icedtea-gcc-4.3.patch | 2 patches/icedtea-graphics.patch | 131 - patches/icedtea-headers.patch | 4 patches/icedtea-lib64.patch | 2 patches/icedtea-libraries.patch | 2 patches/icedtea-ports.patch | 10 patches/icedtea-sunsrc.patch | 8 patches/icedtea-tools.patch | 14 patches/icedtea-use-system-tzdata.patch | 14 patches/icedtea-zero.patch | 14 rt/java/awt/color/CMMException.java | 63 rt/java/awt/color/ColorSpace.java | 190 - rt/java/awt/color/ICC_ColorSpace.java | 314 -- rt/java/awt/color/ICC_Profile.java | 1282 ---------- rt/java/awt/color/ICC_ProfileGray.java | 133 - rt/java/awt/color/ICC_ProfileRGB.java | 227 - rt/java/awt/image/BandedSampleModel.java | 758 ----- rt/java/awt/image/ColorConvertOp.java | 537 ---- rt/java/awt/image/ComponentSampleModel.java | 762 ----- rt/java/awt/image/DataBuffer.java | 473 --- rt/java/awt/image/DataBufferByte.java | 245 - rt/java/awt/image/DataBufferInt.java | 244 - rt/java/awt/image/DataBufferShort.java | 245 - rt/java/awt/image/DataBufferUShort.java | 246 - rt/java/awt/image/MultiPixelPackedSampleModel.java | 602 ---- rt/java/awt/image/Raster.java | 1156 --------- rt/java/awt/image/RenderedImage.java | 70 rt/java/awt/image/SampleModel.java | 981 ------- rt/java/awt/image/SinglePixelPackedSampleModel.java | 597 ---- rt/java/awt/image/WritableRaster.java | 436 --- rt/java/awt/image/WritableRenderedImage.java | 56 rt/java/awt/image/renderable/ContextualRenderedImageFactory.java | 56 rt/java/awt/image/renderable/RenderContext.java | 141 - rt/java/awt/image/renderable/RenderableImage.java | 62 rt/java/awt/image/renderable/RenderableImageOp.java | 157 - rt/java/awt/image/renderable/RenderableImageProducer.java | 166 - rt/java/awt/image/renderable/RenderedImageFactory.java | 47 diffs (truncated from 11017 to 500 lines): diff -r f5e4411c76e2 -r 7676131f9e83 ChangeLog --- a/ChangeLog Thu Feb 28 13:34:20 2008 -0500 +++ b/ChangeLog Mon Mar 03 20:58:16 2008 -0500 @@ -1,3 +1,24 @@ 2008-02-28 Joshua Sumali + + * Makefile.am: Updated to b06. + * Makefile.in: Regenerated. + * patches/icedtea-ant.patch: Updated line numbers for b06. + * patches/icedtea-bytebuffer-compact.patch: Likewise. + * patches/icedtea-copy-plugs.patch: Likewise. + * patches/icedtea-core-build.patch: Likewise. + * patches/icedtea-gcc-4.3.patch: Likewise. + * patches/icedtea-headers.patch: Likewise. + * patches/icedtea-lib64.patch: Likewise. + * patches/icedtea-libraries.patch: Likewise. + * patches/icedtea-ports.patch: Likewise. + * patches/icedtea-sunsrc.patch: Likewise. + * patches/icedtea-tools.patch: Likewise. + * patches/icedtea-use-system-tzdata.patch: Likewise. + * patches/icedtea-zero.patch: Likewise. + * patches/icedtea-graphics.patch: Removed awt patches since new awt code + is included in b06. + * rt/java/awt/*: Removed files since they are newly opened in b06. + 2008-02-28 Joshua Sumali * Makefile.am: diff -r f5e4411c76e2 -r 7676131f9e83 Makefile.am --- a/Makefile.am Thu Feb 28 13:34:20 2008 -0500 +++ b/Makefile.am Mon Mar 03 20:58:16 2008 -0500 @@ -1,6 +1,6 @@ OPENJDK_DATE = 12_feb_2008 -OPENJDK_DATE = 12_feb_2008 -OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120 -OPENJDK_VERSION = b05 +OPENJDK_DATE = 28_feb_2008 +OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b +OPENJDK_VERSION = b06 if NETX_PLUGIN NETX_PATCH = patches/icedtea-netx-plugin.patch diff -r f5e4411c76e2 -r 7676131f9e83 Makefile.in --- a/Makefile.in Thu Feb 28 13:34:20 2008 -0500 +++ b/Makefile.in Mon Mar 03 20:58:16 2008 -0500 @@ -209,9 +209,9 @@ target_alias = @target_alias@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -OPENJDK_DATE = 12_feb_2008 -OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120 -OPENJDK_VERSION = b05 +OPENJDK_DATE = 28_feb_2008 +OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b +OPENJDK_VERSION = b06 @NETX_PLUGIN_FALSE at NETX_PATCH = @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ diff -r f5e4411c76e2 -r 7676131f9e83 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r f5e4411c76e2 -r 7676131f9e83 generated/sun/awt/X11/generator/sizer.32.c --- a/generated/sun/awt/X11/generator/sizer.32.c Thu Feb 28 13:34:20 2008 -0500 +++ b/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 20:58:16 2008 -0500 @@ -6,11 +6,25 @@ #include #include -#include #include #include "awt_p.h" #include "color.h" #include "colordata.h" + +/* the struct below was copied from MwmUtil.h to workaround a lesstif bug: + http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */ + +typedef struct PROPMOTIFWMHINTS { +/* 32-bit property items are stored as long on the client (whether + * that means 32 bits or 64). XChangeProperty handles the conversion + * to the actual 32-bit quantities sent to the server. + */ + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; +} PropMwmHints; int main(){ diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-ant.patch --- a/patches/icedtea-ant.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-ant.patch Mon Mar 03 20:58:16 2008 -0500 @@ -96,7 +96,7 @@ # Default target and expected 'do everything' target --- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400 +++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500 -@@ -100,6 +100,7 @@ +@@ -109,6 +109,7 @@ memoryMaximumSize="${javac.memoryMaximumSize}" target="${javac.target}" excludes="com/sun/tools/internal/txw2/**"> diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-bytebuffer-compact.patch --- a/patches/icedtea-bytebuffer-compact.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-bytebuffer-compact.patch Mon Mar 03 20:58:16 2008 -0500 @@ -42,7 +42,7 @@ return this; } -@@ -367,7 +367,7 @@ +@@ -368,7 +368,7 @@ */ public final Buffer rewind() { position = 0; @@ -51,7 +51,7 @@ return this; } -@@ -548,4 +548,8 @@ +@@ -547,4 +547,8 @@ throw new IndexOutOfBoundsException(); } diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-copy-plugs.patch --- a/patches/icedtea-copy-plugs.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-copy-plugs.patch Mon Mar 03 20:58:16 2008 -0500 @@ -33,8 +33,8 @@ diff -urN openjdk.orig/jdk/src/share/cla Type[] paramTypes = constr.getGenericParameterTypes(); if (paramTypes.length != propertyNames.length) { ---- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig 2008-02-27 16:48:35.000000000 -0500 -+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-27 16:46:09.000000000 -0500 +--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-28 04:39:40.000000000 -0500 ++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-29 14:28:47.000000000 -0500 @@ -51,28 +51,19 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ @@ -66,17 +66,7 @@ diff -urN openjdk.orig/jdk/src/share/cla PLUG_SOUND_CLASS_NAMES = \ com/sun/media/sound/AbstractPlayer.class \ -@@ -130,9 +121,6 @@ - java/awt/color/CMMException.class \ - java/awt/color/ColorSpace.class \ - java/awt/color/ICC_ColorSpace.class \ --java/awt/color/ICC_Profile\$$1.class \ --java/awt/color/ICC_Profile\$$2.class \ --java/awt/color/ICC_Profile\$$3.class \ - java/awt/color/ICC_Profile.class \ - java/awt/color/ICC_ProfileGray.class \ - java/awt/color/ICC_ProfileRGB.class \ -@@ -162,8 +150,14 @@ +@@ -128,8 +119,14 @@ # Class list temp files (used by both import and export of plugs) @@ -87,13 +77,13 @@ diff -urN openjdk.orig/jdk/src/share/cla +PLUG_NETX_CLASS_NAMES = net + PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs --PLUG_CLASS_AREAS = jmf sound awt -+PLUG_CLASS_AREAS = jmf sound awt gnu javax netx +-PLUG_CLASS_AREAS = jmf sound ++PLUG_CLASS_AREAS = jmf sound gnu javax netx PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist) # Create jargs file command -@@ -191,6 +185,21 @@ - @for i in $(PLUG_AWT_CLASS_NAMES) ; do \ +@@ -152,6 +149,21 @@ + @for i in $(PLUG_SOUND_CLASS_NAMES) ; do \ $(ECHO) "$$i" >> $@ ; \ done +$(PLUG_TEMPDIR)/gnu.clist: @@ -114,9 +104,9 @@ diff -urN openjdk.orig/jdk/src/share/cla $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS) @$(prep-target) $(CAT) $(PLUG_CLISTS) > $@ -@@ -200,6 +209,12 @@ +@@ -159,6 +171,12 @@ $(plug-create-jargs) - $(PLUG_TEMPDIR)/awt.jargs: $(PLUG_TEMPDIR)/awt.clist + $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist $(plug-create-jargs) +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist + $(plug-create-jargs) @@ -127,7 +117,7 @@ diff -urN openjdk.orig/jdk/src/share/cla $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist $(plug-create-jargs) -@@ -229,9 +244,9 @@ +@@ -188,9 +206,9 @@ # Import classes command define import-binary-plug-classes @@ -139,10 +129,10 @@ diff -urN openjdk.orig/jdk/src/share/cla endef # import-binary-plug-classes else # IMPORT_BINARY_PLUGS -@@ -263,13 +278,22 @@ +@@ -220,12 +238,21 @@ + $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist) + import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist) - import-binary-plug-awt-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/awt.clist - $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/awt.clist) +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist + $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist) +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist @@ -154,12 +144,11 @@ diff -urN openjdk.orig/jdk/src/share/cla import-binary-plug-jar: \ import-binary-plug-jmf-classes \ - import-binary-plug-sound-classes \ -- import-binary-plug-awt-classes -+ import-binary-plug-awt-classes \ +- import-binary-plug-sound-classes ++ import-binary-plug-sound-classes \ + import-binary-plug-gnu-classes \ -+ import-binary-plug-javax-classes \ -+ import-binary-plug-netx-classes \ ++ import-binary-plug-javax-classes \ ++ import-binary-plug-netx-classes \ # Import native libraries diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-core-build.patch --- a/patches/icedtea-core-build.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-core-build.patch Mon Mar 03 20:58:16 2008 -0500 @@ -116,7 +116,7 @@ diff -ru openjdk.orig/jdk/make/java/redi ifeq ($(PLATFORM), windows) # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows -@@ -119,8 +149,7 @@ +@@ -122,8 +152,7 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME) @@ -126,7 +126,7 @@ diff -ru openjdk.orig/jdk/make/java/redi IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME) endif -@@ -151,17 +180,25 @@ +@@ -154,17 +183,25 @@ # NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows IMPORT_LIST += \ @@ -156,7 +156,7 @@ diff -ru openjdk.orig/jdk/make/java/redi ifeq ($(PLATFORM), solaris) # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris -@@ -195,11 +232,25 @@ +@@ -198,11 +235,25 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) $(install-import-file) @@ -184,7 +184,7 @@ diff -ru openjdk.orig/jdk/make/java/redi @$(prep-target) $(LN) -s ../$(LIBJSIG_NAME) $@ -@@ -224,6 +275,9 @@ +@@ -227,6 +278,9 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt $(install-import-file) diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-gcc-4.3.patch --- a/patches/icedtea-gcc-4.3.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-gcc-4.3.patch Mon Mar 03 20:58:16 2008 -0500 @@ -31,7 +31,7 @@ #include #else #include -@@ -96,8 +96,11 @@ +@@ -99,8 +99,11 @@ FileBuffRegion *copy(); // Deep copy FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-graphics.patch --- a/patches/icedtea-graphics.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-graphics.patch Mon Mar 03 20:58:16 2008 -0500 @@ -1,110 +1,3 @@ diff -urN openjdk.orig/jdk/src/share/nat -diff -urN openjdk.orig/jdk/src/share/native/sun/awt/image/imageInitIDs.h openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/imageInitIDs.h 2007-07-20 03:33:46.000000000 -0400 -+++ openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.h 2007-07-25 15:55:05.000000000 -0400 -@@ -120,7 +120,4 @@ - IMGEXTERN jfieldID g_KernelYOriginD; - IMGEXTERN jfieldID g_KernelDataID; - --/* DataBufferInt ids */ --IMGEXTERN jfieldID g_DataBufferIntPdataID; -- - #endif /* IMAGEINITIDS_H */ ---- iopenjdkb23/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2007-10-30 04:38:58.000000000 -0400 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2007-11-13 12:43:26.000000000 -0500 -@@ -505,5 +505,5 @@ - IL_offset_fID = (*env)->GetFieldID (env, IL, "offset", "I"); - IL_nextRowOffset_fID = (*env)->GetFieldID (env, IL, "nextRowOffset", "I"); - -- PF_ID_fID = (*env)->GetFieldID (env, Pf, "ID", "J"); -+ PF_ID_fID = (*env)->GetFieldID (env, Pf, "profileID", "J"); - } ---- iopenjdkb23/openjdk/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java 2007-10-30 04:37:17.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java 2007-11-13 12:47:25.000000000 -0500 -@@ -55,51 +55,48 @@ - public int[] getData(DataBufferInt dbi, int bank); - public StateTrackableDelegate getTrackable(DataBuffer db); - } -- -+/* - public static void setDataStealer(DataStealer ds) { - if (stealer != null) { - throw new InternalError("Attempt to set DataStealer twice"); - } - stealer = ds; - } -- -+*/ - public static byte[] stealData(DataBufferByte dbb, int bank) { -- return stealer.getData(dbb, bank); -+// return stealer.getData(dbb, bank); -+ return dbb.getData(bank); - } - - public static short[] stealData(DataBufferUShort dbus, int bank) { -- return stealer.getData(dbus, bank); -+// return stealer.getData(dbus, bank); -+ return dbus.getData(bank); - } - - public static int[] stealData(DataBufferInt dbi, int bank) { -- return stealer.getData(dbi, bank); -+// return stealer.getData(dbi, bank); -+ return dbi.getData(bank); - } - - public static StateTrackableDelegate stealTrackable(DataBuffer db) { -- return stealer.getTrackable(db); -+// return stealer.getTrackable(db); -+ return StateTrackableDelegate.UNTRACKABLE_DELEGATE; - } - - public static void markDirty(DataBuffer db) { -- stealer.getTrackable(db).markDirty(); -+// stealer.getTrackable(db).markDirty(); - } - - public static void markDirty(WritableRaster wr) { -- if (wr instanceof SunWritableRaster) { -- ((SunWritableRaster) wr).markDirty(); -- } else { -- markDirty(wr.getDataBuffer()); -- } - } - - public static void markDirty(Image img) { -- SurfaceData.getPrimarySurfaceData(img).markDirty(); - } - - private StateTrackableDelegate theTrackable; - - public SunWritableRaster(SampleModel sampleModel, Point origin) { - super(sampleModel, origin); -- theTrackable = stealTrackable(dataBuffer); - } - - public SunWritableRaster(SampleModel sampleModel, -@@ -107,7 +104,6 @@ - Point origin) - { - super(sampleModel, dataBuffer, origin); -- theTrackable = stealTrackable(dataBuffer); - } - - public SunWritableRaster(SampleModel sampleModel, -@@ -117,13 +113,11 @@ - WritableRaster parent) - { - super(sampleModel, dataBuffer, aRegion, sampleModelTranslate, parent); -- theTrackable = stealTrackable(dataBuffer); - } - - /** - * Mark the TrackableDelegate of the associated DataBuffer dirty. - */ - public final void markDirty() { -- theTrackable.markDirty(); - } - } --- ../opienjdkb23/openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-10-30 04:37:06.000000000 -0400 +++ openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-11-13 12:50:52.000000000 -0500 @@ -236,9 +236,6 @@ @@ -165,27 +58,3 @@ diff -urN openjdk.orig/jdk/src/share/nat throw new IllegalArgumentException("Invalid axis: " + axis); } } ---- ../iopenjdkb23/openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.c 2007-10-30 04:38:50.000000000 -0400 -+++ openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.c 2007-11-13 12:52:43.000000000 -0500 -@@ -143,7 +143,7 @@ - jclass cls) { - g_SPPSMmaskArrID = (*env)->GetFieldID(env, cls, "bitMasks", "[I"); - g_SPPSMmaskOffID = (*env)->GetFieldID(env, cls, "bitOffsets", "[I"); -- g_SPPSMnBitsID = (*env)->GetFieldID(env, cls, "bitSizes", "[I"); -+ g_SPPSMnBitsID = (*env)->GetFieldID(env, cls, "sampleSize", "[I"); - g_SPPSMmaxBitID = (*env)->GetFieldID(env, cls, "maxBitSize", "I"); - - if (g_SPPSMmaskArrID == NULL || g_SPPSMmaskOffID == NULL || -@@ -228,12 +228,3 @@ - JNU_ThrowNullPointerException(env, "Unable to grab field ids"); - } - } -- --JNIEXPORT void JNICALL --Java_java_awt_image_DataBufferInt_initIDs(JNIEnv *env, jclass cls) { -- g_DataBufferIntPdataID = (*env)->GetFieldID(env, cls, "pData", "J"); -- if (g_DataBufferIntPdataID == NULL) { -- JNU_ThrowNullPointerException(env, "Unable to grab DataBufferInt.pData"); -- return; -- } --} diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-headers.patch --- a/patches/icedtea-headers.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-headers.patch Mon Mar 03 20:58:16 2008 -0500 @@ -11,7 +11,7 @@ --- openjdkold/jdk/make/tools/freetypecheck/Makefile 2008-01-04 18:20:30.000000000 -0500 +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2008-02-26 11:21:34.000000000 -0500 -@@ -54,7 +54,7 @@ +@@ -61,7 +61,7 @@ ifeq ($(PLATFORM), solaris) FT_OPTIONS += -R $(FT_LIB) -lfreetype else #linux @@ -22,7 +22,7 @@ --- openjdkold/jdk/make/common/Defs.gmk 2008-01-04 18:20:29.000000000 -0500 +++ openjdk/jdk/make/common/Defs.gmk 2008-02-26 11:21:49.000000000 -0500 -@@ -225,7 +225,7 @@ +@@ -237,7 +237,7 @@ ifeq ($(PLATFORM), windows) FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib else diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-lib64.patch --- a/patches/icedtea-lib64.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-lib64.patch Mon Mar 03 20:58:16 2008 -0500 @@ -1,6 +1,6 @@ --- origopenjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-04 18:11:53.000000000 -0500 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-11 11:15:24.000000000 -0500 -@@ -265,7 +265,12 @@ +@@ -271,7 +271,12 @@ * ... * 7: The default directories, normally /lib and /usr/lib. */ diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-libraries.patch --- a/patches/icedtea-libraries.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-libraries.patch Mon Mar 03 20:58:16 2008 -0500 @@ -75,7 +75,7 @@ LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli -@@ -250,7 +250,6 @@ +@@ -251,7 +251,6 @@ endif OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-ports.patch --- a/patches/icedtea-ports.patch Thu Feb 28 13:34:20 2008 -0500 +++ b/patches/icedtea-ports.patch Mon Mar 03 20:58:16 2008 -0500 @@ -57,7 +57,7 @@ diff -ru openjdk.orig/hotspot/src/os/lin diff -ru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp --- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-11-08 11:34:54.000000000 +0000 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-11-08 11:36:15.000000000 +0000 -@@ -171,6 +171,12 @@ +@@ -174,6 +174,12 @@ # else static char cpu_arch[] = "sparc"; # endif @@ -70,7 +70,7 @@ diff -ru openjdk.orig/hotspot/src/os/lin #else #error Add appropriate cpu_arch setting #endif -@@ -2372,7 +2378,8 @@ +@@ -2370,7 +2376,8 @@ // format has been changed), we'll use the largest page size supported by // the processor. @@ -83,7 +83,7 @@ diff -ru openjdk.orig/hotspot/src/share/ diff -ru 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 2007-11-08 11:34:54.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2007-11-08 11:36:15.000000000 +0000 -@@ -147,7 +147,8 @@ +@@ -146,7 +146,8 @@ #define CPU IA32_ONLY("x86") \ IA64_ONLY("ia64") \ AMD64_ONLY("amd64") \ @@ -96,7 +96,7 @@ diff -ru openjdk.orig/hotspot/src/share/ diff -ru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp --- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp 2007-11-08 11:34:54.000000000 +0000 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2007-11-08 11:36:15.000000000 +0000 -@@ -176,6 +176,14 @@ +@@ -156,6 +156,14 @@ #define NOT_SPARC(code) code #endif From jsumali at redhat.com Mon Mar 3 19:06:26 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 04 Mar 2008 03:06:26 +0000 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali changeset bfc8cc10d880 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bfc8cc10d880 description: 2008-03-03 Joshua Sumali * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this in revision 633. Reverting back to rev 632. * generated/sun/awt/X11/generator/sizer.32.c: Likewise. diffstat: 2 files changed, 7 insertions(+), 15 deletions(-) ChangeLog | 6 ++++++ generated/sun/awt/X11/generator/sizer.32.c | 16 +--------------- diffs (45 lines): diff -r 7676131f9e83 -r bfc8cc10d880 ChangeLog --- a/ChangeLog Mon Mar 03 20:58:16 2008 -0500 +++ b/ChangeLog Mon Mar 03 22:06:10 2008 -0500 @@ -1,3 +1,9 @@ 2008-03-03 Joshua Sumali + + * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this + in revision 633. Reverting back to rev 632. + * generated/sun/awt/X11/generator/sizer.32.c: Likewise. + 2008-03-03 Joshua Sumali * Makefile.am: Updated to b06. diff -r 7676131f9e83 -r bfc8cc10d880 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r 7676131f9e83 -r bfc8cc10d880 generated/sun/awt/X11/generator/sizer.32.c --- a/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 20:58:16 2008 -0500 +++ b/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 22:06:10 2008 -0500 @@ -6,25 +6,11 @@ #include #include +#include #include #include "awt_p.h" #include "color.h" #include "colordata.h" - -/* the struct below was copied from MwmUtil.h to workaround a lesstif bug: - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */ - -typedef struct PROPMOTIFWMHINTS { -/* 32-bit property items are stored as long on the client (whether - * that means 32 bits or 64). XChangeProperty handles the conversion - * to the actual 32-bit quantities sent to the server. - */ - unsigned long flags; - unsigned long functions; - unsigned long decorations; - long inputMode; - unsigned long status; -} PropMwmHints; int main(){ From langel at redhat.com Mon Mar 3 19:45:05 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 03 Mar 2008 22:45:05 -0500 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali References: Message-ID: <47CCC5C1.6090300@redhat.com> I think these files should have been committed. As you see, one contains the lesstif fix (windows decorations). The original sources have been changed- thus the generated files have been changed. We can get rid of the lesstif patch as well. Lillian Joshua Sumali wrote: > changeset bfc8cc10d880 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bfc8cc10d880 > description: > 2008-03-03 Joshua Sumali > > * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this > in revision 633. Reverting back to rev 632. > * generated/sun/awt/X11/generator/sizer.32.c: Likewise. > > diffstat: > > 2 files changed, 7 insertions(+), 15 deletions(-) > ChangeLog | 6 ++++++ > generated/sun/awt/X11/generator/sizer.32.c | 16 +--------------- > > diffs (45 lines): > > diff -r 7676131f9e83 -r bfc8cc10d880 ChangeLog > --- a/ChangeLog Mon Mar 03 20:58:16 2008 -0500 > +++ b/ChangeLog Mon Mar 03 22:06:10 2008 -0500 > @@ -1,3 +1,9 @@ 2008-03-03 Joshua Sumali +2008-03-03 Joshua Sumali > + > + * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this > + in revision 633. Reverting back to rev 632. > + * generated/sun/awt/X11/generator/sizer.32.c: Likewise. > + > 2008-03-03 Joshua Sumali > > * Makefile.am: Updated to b06. > diff -r 7676131f9e83 -r bfc8cc10d880 generated/sun/awt/X11/generator/sizer.32 > Binary file generated/sun/awt/X11/generator/sizer.32 has changed > diff -r 7676131f9e83 -r bfc8cc10d880 generated/sun/awt/X11/generator/sizer.32.c > --- a/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 20:58:16 2008 -0500 > +++ b/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 22:06:10 2008 -0500 > @@ -6,25 +6,11 @@ > #include > #include > > +#include > #include > #include "awt_p.h" > #include "color.h" > #include "colordata.h" > - > -/* the struct below was copied from MwmUtil.h to workaround a lesstif bug: > - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */ > - > -typedef struct PROPMOTIFWMHINTS { > -/* 32-bit property items are stored as long on the client (whether > - * that means 32 bits or 64). XChangeProperty handles the conversion > - * to the actual 32-bit quantities sent to the server. > - */ > - unsigned long flags; > - unsigned long functions; > - unsigned long decorations; > - long inputMode; > - unsigned long status; > -} PropMwmHints; > > > int main(){ > From langel at redhat.com Mon Mar 3 20:28:21 2008 From: langel at redhat.com (Lillian Angel) Date: Tue, 04 Mar 2008 04:28:21 +0000 Subject: changeset in /hg/icedtea6: 2008-03-03 Lillian Angel changeset 49c8635e90a6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=49c8635e90a6 description: 2008-03-03 Lillian Angel * generated/sun/awt/X11/generator/sizer.32: Regenerated. * generated/sun/awt/X11/generator/sizer.32.c: Likewise. * patches/icedtea-lesstif-64.patch: Removed. * Makefile.am: Removed above patch. * Makefile.in: Regenerated. * rt/java/io/PushbackReader.java: New file. diffstat: 6 files changed, 86 insertions(+), 32 deletions(-) ChangeLog | 9 ++++ Makefile.am | 1 Makefile.in | 1 generated/sun/awt/X11/generator/sizer.32.c | 16 ++++++- patches/icedtea-lesstif-64.patch | 29 ------------- rt/java/io/PushbackReader.java | 62 ++++++++++++++++++++++++++++ diffs (169 lines): diff -r bfc8cc10d880 -r 49c8635e90a6 ChangeLog --- a/ChangeLog Mon Mar 03 22:06:10 2008 -0500 +++ b/ChangeLog Mon Mar 03 23:26:02 2008 -0500 @@ -1,3 +1,12 @@ 2008-03-03 Joshua Sumali + + * generated/sun/awt/X11/generator/sizer.32: Regenerated. + * generated/sun/awt/X11/generator/sizer.32.c: Likewise. + * patches/icedtea-lesstif-64.patch: Removed. + * Makefile.am: Removed above patch. + * Makefile.in: Regenerated. + * rt/java/io/PushbackReader.java: New file. + 2008-03-03 Joshua Sumali * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this diff -r bfc8cc10d880 -r 49c8635e90a6 Makefile.am --- a/Makefile.am Mon Mar 03 22:06:10 2008 -0500 +++ b/Makefile.am Mon Mar 03 23:26:02 2008 -0500 @@ -232,7 +232,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-generated.patch \ patches/icedtea-lib64.patch \ patches/icedtea-zero.patch \ - patches/icedtea-lesstif-64.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(ZERO_BUILD_PATCH) \ diff -r bfc8cc10d880 -r 49c8635e90a6 Makefile.in --- a/Makefile.in Mon Mar 03 22:06:10 2008 -0500 +++ b/Makefile.in Mon Mar 03 23:26:02 2008 -0500 @@ -362,7 +362,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-generated.patch \ patches/icedtea-lib64.patch \ patches/icedtea-zero.patch \ - patches/icedtea-lesstif-64.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(ZERO_BUILD_PATCH) \ diff -r bfc8cc10d880 -r 49c8635e90a6 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r bfc8cc10d880 -r 49c8635e90a6 generated/sun/awt/X11/generator/sizer.32.c --- a/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 22:06:10 2008 -0500 +++ b/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 23:26:02 2008 -0500 @@ -6,11 +6,25 @@ #include #include -#include #include #include "awt_p.h" #include "color.h" #include "colordata.h" + +/* the struct below was copied from MwmUtil.h to workaround a lesstif bug: + http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */ + +typedef struct PROPMOTIFWMHINTS { +/* 32-bit property items are stored as long on the client (whether + * that means 32 bits or 64). XChangeProperty handles the conversion + * to the actual 32-bit quantities sent to the server. + */ + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; +} PropMwmHints; int main(){ diff -r bfc8cc10d880 -r 49c8635e90a6 patches/icedtea-lesstif-64.patch --- a/patches/icedtea-lesstif-64.patch Mon Mar 03 22:06:10 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ ---- openjdk/j2se/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java~ 2007-09-01 12:47:07.000000000 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2007-09-01 13:38:52.000000000 +0200 -@@ -1137,12 +1137,25 @@ public class WrapperGenerator { - - pw.println("/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/\n" ); - pw.println("#include \n#include \n#include \n#include \n#include \n"); -- pw.println("#include "); - pw.println("#include "); - pw.println("#include \"awt_p.h\""); - pw.println("#include \"color.h\""); - pw.println("#include \"colordata.h\""); - -+ pw.println("\n/* the struct below was copied from MwmUtil.h to workaround a lesstif bug:"); -+ pw.println(" http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */"); -+ pw.println("\ntypedef struct PROPMOTIFWMHINTS {"); -+ pw.println("/* 32-bit property items are stored as long on the client (whether"); -+ pw.println(" * that means 32 bits or 64). XChangeProperty handles the conversion"); -+ pw.println(" * to the actual 32-bit quantities sent to the server."); -+ pw.println(" */"); -+ pw.println(" unsigned long flags;"); -+ pw.println(" unsigned long functions;"); -+ pw.println(" unsigned long decorations;"); -+ pw.println(" long inputMode;"); -+ pw.println(" unsigned long status;"); -+ pw.println("} PropMwmHints;"); -+ - pw.println("\n\nint main(){"); - j=0; - for ( eo = symbolTable.elements() ; eo.hasMoreElements() ;) { diff -r bfc8cc10d880 -r 49c8635e90a6 rt/java/io/PushbackReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/java/io/PushbackReader.java Mon Mar 03 23:26:02 2008 -0500 @@ -0,0 +1,62 @@ +/* PushbackReader.java -- + Copyright (C) 2007 Free Software Foundation, Inc. + + This file is part of GNU Classpath. + + GNU Classpath is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Classpath 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 for more details. + + You should have received a copy of the GNU General Public License + along with GNU Classpath; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ + +package java.io; + +import java.io.Reader; + +public class PushbackReader +{ + public PushbackReader(Reader r, int i) + { + } + + public int read() + { + return 0; + } + + public int unread(char[] cbuf, int off, int len) + { + return 0; + } + + public int read(char[] c) + { + return 0; + } +} From langel at redhat.com Mon Mar 3 20:44:25 2008 From: langel at redhat.com (Lillian Angel) Date: Tue, 04 Mar 2008 04:44:25 +0000 Subject: changeset in /hg/icedtea: 2008-03-03 Lillian Angel changeset 9e8d59b0bcbe in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9e8d59b0bcbe description: 2008-03-03 Lillian Angel * Makefile.am: Fixed distclean target * Makefile.in: Regenerated. diffstat: 3 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 2 +- Makefile.in | 2 +- diffs (36 lines): diff -r 5398c0d9a012 -r 9e8d59b0bcbe ChangeLog --- a/ChangeLog Mon Mar 03 06:47:12 2008 -0500 +++ b/ChangeLog Mon Mar 03 23:42:06 2008 -0500 @@ -1,3 +1,8 @@ 2008-03-03 Gary Benson + + * Makefile.am: Fixed distclean target + * Makefile.in: Regenerated. + 2008-03-03 Gary Benson * patches/icedtea-ports.patch diff -r 5398c0d9a012 -r 9e8d59b0bcbe Makefile.am --- a/Makefile.am Mon Mar 03 06:47:12 2008 -0500 +++ b/Makefile.am Mon Mar 03 23:42:06 2008 -0500 @@ -28,7 +28,7 @@ all-local: icedtea-against-icedtea distclean-local: clean-copy rm -rf stamps - rm -f rt-source-files.txt tools-source-files.txt \ + rm -f rt-source-files.txt \ hotspot-tools-source-files.txt rm -rf bootstrap rm -rf lib diff -r 5398c0d9a012 -r 9e8d59b0bcbe Makefile.in --- a/Makefile.in Mon Mar 03 06:47:12 2008 -0500 +++ b/Makefile.in Mon Mar 03 23:42:06 2008 -0500 @@ -699,7 +699,7 @@ all-local: icedtea-against-icedtea distclean-local: clean-copy rm -rf stamps - rm -f rt-source-files.txt tools-source-files.txt \ + rm -f rt-source-files.txt \ hotspot-tools-source-files.txt rm -rf bootstrap rm -rf lib From langel at redhat.com Mon Mar 3 21:08:30 2008 From: langel at redhat.com (Lillian Angel) Date: Tue, 04 Mar 2008 05:08:30 +0000 Subject: changeset in /hg/icedtea6: 2008-03-04 Lillian Angel changeset 4ae0b7d21b26 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4ae0b7d21b26 description: 2008-03-04 Lillian Angel * generated/*: Updated generated files. * Makefile.am: Fixed distclean target. * Makefile.in: Regenerated. diffstat: 38 files changed, 27 insertions(+), 111 deletions(-) ChangeLog | 6 +++ Makefile.am | 4 +- Makefile.in | 4 +- generated/com/sun/java/swing/plaf/gtk/resources/gtk.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java | 2 - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 3 - generated/java/nio/ByteBuffer.java | 6 +-- generated/java/nio/CharBuffer.java | 4 -- generated/java/nio/DoubleBuffer.java | 4 -- generated/java/nio/FloatBuffer.java | 4 -- generated/java/nio/IntBuffer.java | 4 -- generated/java/nio/LongBuffer.java | 4 -- generated/java/nio/ShortBuffer.java | 4 -- generated/sun/awt/X11/generator/sizer.32.c | 16 ---------- generated/sun/misc/Version.java | 14 +------- generated/sun/tools/jconsole/Version.java | 2 - generated/sun/util/resources/CalendarData_ro.java | 2 + generated/sun/util/resources/CurrencyNames_en_CA.java | 1 generated/sun/util/resources/LocaleNames_fi.java | 4 +- diffs (truncated from 658 to 500 lines): diff -r 49c8635e90a6 -r 4ae0b7d21b26 ChangeLog --- a/ChangeLog Mon Mar 03 23:26:02 2008 -0500 +++ b/ChangeLog Tue Mar 04 00:06:10 2008 -0500 @@ -1,3 +1,9 @@ 2008-03-03 Lillian Angel + + * generated/*: Updated generated files. + * Makefile.am: Fixed distclean target. + * Makefile.in: Regenerated. + 2008-03-03 Lillian Angel * generated/sun/awt/X11/generator/sizer.32: Regenerated. diff -r 49c8635e90a6 -r 4ae0b7d21b26 Makefile.am --- a/Makefile.am Mon Mar 03 23:26:02 2008 -0500 +++ b/Makefile.am Tue Mar 04 00:06:10 2008 -0500 @@ -15,7 +15,7 @@ all-local: icedtea-against-icedtea distclean-local: clean-copy rm -rf stamps - rm -f rt-source-files.txt tools-source-files.txt \ + rm -f rt-source-files.txt \ hotspot-tools-source-files.txt rm -rf bootstrap rm -rf lib @@ -38,7 +38,7 @@ install: EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \ - tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch + patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. diff -r 49c8635e90a6 -r 4ae0b7d21b26 Makefile.in --- a/Makefile.in Mon Mar 03 23:26:02 2008 -0500 +++ b/Makefile.in Tue Mar 04 00:06:10 2008 -0500 @@ -216,7 +216,7 @@ OPENJDK_VERSION = b06 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \ - tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch + patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch # The Binary plugs directory is called jdk1.7.0 for historical reasons. The @@ -685,7 +685,7 @@ all-local: icedtea-against-icedtea distclean-local: clean-copy rm -rf stamps - rm -f rt-source-files.txt tools-source-files.txt \ + rm -f rt-source-files.txt \ hotspot-tools-source-files.txt rm -rf bootstrap rm -rf lib diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk extends ListResou { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "New Folder" }, { "FileChooser.newFolderDialogText", "Folder name:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "OK" }, { "FileChooser.openButtonToolTipText", "Open selected file." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_de extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "Neuer Ordner" }, { "FileChooser.newFolderDialogText", "Ordnername:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "OK" }, { "FileChooser.openButtonToolTipText", "Ausgew\u00E4hlte Datei \u00F6ffnen" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_es extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "Nueva carpeta" }, { "FileChooser.newFolderDialogText", "Nombre de la carpeta:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "Aceptar" }, { "FileChooser.openButtonToolTipText", "Abrir el archivo seleccionado." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_fr extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "Nouveau dossier" }, { "FileChooser.newFolderDialogText", "Nom de dossier:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "OK" }, { "FileChooser.openButtonToolTipText", "Ouvrir le fichier s\u00E9lectionn\u00E9." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_it extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "Nuova cartella" }, { "FileChooser.newFolderDialogText", "Nome della cartella:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "OK" }, { "FileChooser.openButtonToolTipText", "Apre il file selezionato." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_ja extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "\u65B0\u898F\u30D5\u30A9\u30EB\u30C0" }, { "FileChooser.newFolderDialogText", "\u30D5\u30A9\u30EB\u30C0\u540D:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u4E86\u89E3" }, { "FileChooser.openButtonToolTipText", "\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_ko extends ListRe { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "\uC0C8 \uD3F4\uB354" }, { "FileChooser.newFolderDialogText", "\uD3F4\uB354 \uC774\uB984:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\uD655\uC778" }, { "FileChooser.openButtonToolTipText", "\uC120\uD0DD\uD55C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_sv extends ListRe { "FileChooser.newFolderButtonMnemonic", "70" }, { "FileChooser.newFolderButtonText", "Ny mapp" }, { "FileChooser.newFolderDialogText", "Mapp:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "OK" }, { "FileChooser.openButtonToolTipText", "\u00D6ppna den markerade filen." }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_zh_CN extends Lis { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "\u65B0\u5EFA\u6587\u4EF6\u5939" }, { "FileChooser.newFolderDialogText", "\u6587\u4EF6\u5939\u540D\uFF1A" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u786E\u5B9A" }, { "FileChooser.openButtonToolTipText", "\u6253\u5F00\u9009\u5B9A\u7684\u6587\u4EF6\u3002" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_zh_HK extends Lis { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "\u65B0\u6A94\u6848\u593E" }, { "FileChooser.newFolderDialogText", "\u6A94\u6848\u593E\u540D\u7A31:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u78BA\u5B9A" }, { "FileChooser.openButtonToolTipText", "\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java --- a/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java Tue Mar 04 00:06:10 2008 -0500 @@ -19,8 +19,6 @@ public final class gtk_zh_TW extends Lis { "FileChooser.newFolderButtonMnemonic", "78" }, { "FileChooser.newFolderButtonText", "\u65B0\u6A94\u6848\u593E" }, { "FileChooser.newFolderDialogText", "\u6A94\u6848\u593E\u540D\u7A31:" }, - { "FileChooser.newFolderNoDirectoryErrorText", "Error creating directory \"{0}\": No such file or directory" }, - { "FileChooser.newFolderNoDirectoryErrorTitleText", "Error" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u78BA\u5B9A" }, { "FileChooser.openButtonToolTipText", "\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic extends ListRes { "FileChooser.helpButtonToolTipText", "FileChooser help" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Error creating new folder" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "Open" }, { "FileChooser.openButtonToolTipText", "Open selected file" }, { "FileChooser.openDialogTitleText", "Open" }, { "FileChooser.other.newFolder", "NewFolder" }, { "FileChooser.other.newFolder.subsequent", "NewFolder.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name. " }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_de extends List { "FileChooser.helpButtonToolTipText", "Hilfe f\u00FCr Dateiauswahl" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Fehler beim Erstellen eines neuen Ordners" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "70" }, { "FileChooser.openButtonText", "\u00D6ffnen" }, { "FileChooser.openButtonToolTipText", "Ausgew\u00E4hlte Datei \u00F6ffnen" }, { "FileChooser.openDialogTitleText", "\u00D6ffnen" }, { "FileChooser.other.newFolder", "Neuer Ordner" }, { "FileChooser.other.newFolder.subsequent", "Neuer Ordner.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_es extends List { "FileChooser.helpButtonToolTipText", "Ayuda elector de archivos" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Error al crear una nueva carpeta" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "65" }, { "FileChooser.openButtonText", "Abrir" }, { "FileChooser.openButtonToolTipText", "Abrir archivo seleccionado" }, { "FileChooser.openDialogTitleText", "Abrir" }, { "FileChooser.other.newFolder", "Carpeta nueva" }, { "FileChooser.other.newFolder.subsequent", "Carpeta nueva.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "71" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_fr extends List { "FileChooser.helpButtonToolTipText", "Aide sur le s\u00E9lecteur de fichiers" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Erreur lors de la cr\u00E9ation du nouveau dossier" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "Ouvrir" }, { "FileChooser.openButtonToolTipText", "Ouvre le fichier s\u00E9lectionn\u00E9" }, { "FileChooser.openDialogTitleText", "Ouvrir" }, { "FileChooser.other.newFolder", "Nouveau dossier" }, { "FileChooser.other.newFolder.subsequent", "Nouveau dossier.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "69" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_it extends List { "FileChooser.helpButtonToolTipText", "Guida di Selezione file" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Errore durante la creazione della nuova cartella" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "80" }, { "FileChooser.openButtonText", "Apri" }, { "FileChooser.openButtonToolTipText", "Apri file selezionato" }, { "FileChooser.openDialogTitleText", "Apri" }, { "FileChooser.other.newFolder", "Nuova cartella" }, { "FileChooser.other.newFolder.subsequent", "Nuova cartella.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_ja extends List { "FileChooser.helpButtonToolTipText", "\u30D5\u30A1\u30A4\u30EB\u30C1\u30E5\u30FC\u30B6\u30D8\u30EB\u30D7" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u306B\u5931\u6557" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u958B\u304F" }, { "FileChooser.openButtonToolTipText", "\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F" }, { "FileChooser.openDialogTitleText", "\u958B\u304F" }, { "FileChooser.other.newFolder", "\u65B0\u898F\u30D5\u30A9\u30EB\u30C0" }, { "FileChooser.other.newFolder.subsequent", "\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_ko extends List { "FileChooser.helpButtonToolTipText", "FileChooser \uB3C4\uC6C0\uB9D0" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "\uC0C8 \uD3F4\uB354 \uC791\uC131 \uC624\uB958" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\uC5F4\uAE30" }, { "FileChooser.openButtonToolTipText", "\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30" }, { "FileChooser.openDialogTitleText", "\uC5F4\uAE30" }, { "FileChooser.other.newFolder", "\uC0C8 \uD3F4\uB354" }, { "FileChooser.other.newFolder.subsequent", "\uC0C8 \uD3F4\uB354.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_sv extends List { "FileChooser.helpButtonToolTipText", "Hj\u00E4lp - Filv\u00E4ljare" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "Fel d\u00E5 ny mapp skapades" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "78" }, { "FileChooser.openButtonText", "\u00D6ppna" }, { "FileChooser.openButtonToolTipText", "\u00D6ppna markerad fil" }, { "FileChooser.openDialogTitleText", "\u00D6ppna" }, { "FileChooser.other.newFolder", "Ny mapp" }, { "FileChooser.other.newFolder.subsequent", "Ny mapp.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_zh_CN extends L { "FileChooser.helpButtonToolTipText", "\u6587\u4EF6\u9009\u62E9\u5668\u5E2E\u52A9" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u53D1\u751F\u9519\u8BEF" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u6253\u5F00" }, { "FileChooser.openButtonToolTipText", "\u6253\u5F00\u9009\u62E9\u7684\u6587\u4EF6" }, { "FileChooser.openDialogTitleText", "\u6253\u5F00" }, { "FileChooser.other.newFolder", "\u65B0\u5EFA\u6587\u4EF6\u5939" }, { "FileChooser.other.newFolder.subsequent", "\u65B0\u5EFA\u6587\u4EF6\u5939.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_zh_HK extends L { "FileChooser.helpButtonToolTipText", "\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "\u5EFA\u7ACB\u65B0\u6A94\u6848\u593E\u6642\u767C\u751F\u932F\u8AA4" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u958B\u555F" }, { "FileChooser.openButtonToolTipText", "\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848" }, { "FileChooser.openDialogTitleText", "\u958B\u555F" }, { "FileChooser.other.newFolder", "\u65B0\u8CC7\u6599\u593E" }, { "FileChooser.other.newFolder.subsequent", "\u65B0\u8CC7\u6599\u593E.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java --- a/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java Tue Mar 04 00:06:10 2008 -0500 @@ -59,15 +59,12 @@ public final class basic_zh_TW extends L { "FileChooser.helpButtonToolTipText", "\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E" }, { "FileChooser.newFolderErrorSeparator", ": " }, { "FileChooser.newFolderErrorText", "\u5EFA\u7ACB\u65B0\u6A94\u6848\u593E\u6642\u767C\u751F\u932F\u8AA4" }, - { "FileChooser.newFolderParentDoesntExistText", "Unable to create the folder.\n\nThe system cannot find the path specified." }, - { "FileChooser.newFolderParentDoesntExistTitleText", "Unable to create folder" }, { "FileChooser.openButtonMnemonic", "79" }, { "FileChooser.openButtonText", "\u958B\u555F" }, { "FileChooser.openButtonToolTipText", "\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848" }, { "FileChooser.openDialogTitleText", "\u958B\u555F" }, { "FileChooser.other.newFolder", "\u65B0\u8CC7\u6599\u593E" }, { "FileChooser.other.newFolder.subsequent", "\u65B0\u8CC7\u6599\u593E.{0}" }, - { "FileChooser.renameErrorFileExistsText", "Cannot rename {0}: A file with the name you specified already exists. Specify a different file name." }, { "FileChooser.renameErrorText", "Cannot rename {0}" }, { "FileChooser.renameErrorTitleText", "Error Renaming File or Folder" }, { "FileChooser.saveButtonMnemonic", "83" }, diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/ByteBuffer.java --- a/generated/java/nio/ByteBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/ByteBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -290,8 +290,7 @@ public abstract class ByteBuffer * Allocates a new direct byte buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. Whether or not it has a + * capacity, and its mark will be undefined. Whether or not it has a * {@link #hasArray backing array} is unspecified. * * @param capacity @@ -312,8 +311,7 @@ public abstract class ByteBuffer * Allocates a new byte buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. It will have a {@link #array + * capacity, and its mark will be undefined. It will have a {@link #array * backing array}, and its {@link #arrayOffset array * offset} will be zero. * diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/CharBuffer.java --- a/generated/java/nio/CharBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/CharBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -307,13 +307,11 @@ public abstract class CharBuffer - /** * Allocates a new character buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. It will have a {@link #array + * capacity, and its mark will be undefined. It will have a {@link #array * backing array}, and its {@link #arrayOffset array * offset} will be zero. * diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/DoubleBuffer.java --- a/generated/java/nio/DoubleBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/DoubleBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -307,13 +307,11 @@ public abstract class DoubleBuffer - /** * Allocates a new double buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. It will have a {@link #array + * capacity, and its mark will be undefined. It will have a {@link #array * backing array}, and its {@link #arrayOffset array * offset} will be zero. * diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/FloatBuffer.java --- a/generated/java/nio/FloatBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/FloatBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -307,13 +307,11 @@ public abstract class FloatBuffer - /** * Allocates a new float buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. It will have a {@link #array + * capacity, and its mark will be undefined. It will have a {@link #array * backing array}, and its {@link #arrayOffset array * offset} will be zero. * diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/IntBuffer.java --- a/generated/java/nio/IntBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/IntBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -307,13 +307,11 @@ public abstract class IntBuffer - /** * Allocates a new int buffer. * *

The new buffer's position will be zero, its limit will be its - * capacity, its mark will be undefined, and each of its elements will be - * initialized to zero. It will have a {@link #array + * capacity, and its mark will be undefined. It will have a {@link #array * backing array}, and its {@link #arrayOffset array * offset} will be zero. * diff -r 49c8635e90a6 -r 4ae0b7d21b26 generated/java/nio/LongBuffer.java --- a/generated/java/nio/LongBuffer.java Mon Mar 03 23:26:02 2008 -0500 +++ b/generated/java/nio/LongBuffer.java Tue Mar 04 00:06:10 2008 -0500 @@ -307,13 +307,11 @@ public abstract class LongBuffer - /** From doko at ubuntu.com Tue Mar 4 01:36:01 2008 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 04 Mar 2008 10:36:01 +0100 Subject: [patch icedtea/openjdk] print proper system information using /etc/lsb-release Message-ID: <47CD1801.8020704@ubuntu.com> On Ubuntu we usually keep the version information in /etc/debian_version, which leads to somewhat incorrect system information; just check for /etc/lsb-release before falling back to the other file. Matthias 2008-03-04 Matthias Klose * patches/print-lsb-release.patch: Use /etc/lsb-release for system information before trying /etc/debian_version. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: print-lsb-release.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080304/d5162b8c/attachment.ksh From doko at ubuntu.com Tue Mar 4 01:30:29 2008 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 04 Mar 2008 10:30:29 +0100 Subject: [patch] allow plugin to build using xulrunner-1.9 Message-ID: <47CD16B5.6090307@ubuntu.com> 2008-03-04 Matthias Klose * configure.ac: Check for xulrunner-1.9. Without it, the build fails with gcjwebplugin.cc:60:31: error: nsIPluginInstance.h: No such file or directory gcjwebplugin.cc:61:35: error: nsIPluginInstancePeer.h: No such file or directory gcjwebplugin.cc:62:31: error: nsIPluginTagInfo2.h: No such file or directory MOZILLA_CFLAGS only includes -I/usr/include/xulrunner-1.9b3/stable -I/usr/include/nspr but needs to include as well -I/usr/include/xulrunner-1.9b3/unstable This check must go before the check for mozilla-plugin only. Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: xul1.9.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080304/e5234767/attachment.ksh From gbenson at redhat.com Tue Mar 4 02:43:47 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 4 Mar 2008 10:43:47 +0000 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali References: Message-ID: <20080304104347.GA5247@redhat.com> Hi Josh, You lost a chunk of the tzdata patch with this commit diff -r 5e96a8bfa20f openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp --- a/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp +++ b/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp @@ -397,10 +397,6 @@ void os::init_system_properties_values() Arguments::PropertyList_add (&sp, "javax.net.ssl.trustStorePassword", ""); - - // Use the system zoneinfo files, if present - Arguments::PropertyList_add (&sp, - "user.zoneinfo.dir", "/usr/share/javazi"); #undef malloc #undef getenv Was that intentional? Cheers, Gary From gbenson at redhat.com Tue Mar 4 04:03:42 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 04 Mar 2008 12:03:42 +0000 Subject: changeset in /hg/icedtea6: 2008-03-04 Gary Benson changeset 4e6c7d065b1b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4e6c7d065b1b description: 2008-03-04 Gary Benson * patches/icedtea-hotspot-6b06-7b24.patch: New file. * patches/icedtea-hotspot7-build-fixes.patch: Likewise. * patches/icedtea-bytecodeInterpreter.patch: Likewise. * patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise. * Makefile.am: Apply the above patches when zero is being built. * Makefile.in: Regenerated. * patches/icedtea-linker-options.patch: Reinstate missing hunks. * patches/icedtea-ports.patch: Likewise. * patches/icedtea-zero.patch: Likewise. diffstat: 10 files changed, 201509 insertions(+), 87 deletions(-) ChangeLog | 13 Makefile.am | 13 Makefile.in | 11 patches/icedtea-bytecodeInterpreter.patch | 36 patches/icedtea-bytecodeInterpreterWithChecks.patch | 18 patches/icedtea-hotspot-6b06-7b24.patch |201186 +++++++++++++++++++ patches/icedtea-hotspot7-build-fixes.patch | 64 patches/icedtea-linker-options.patch | 12 patches/icedtea-ports.patch | 206 patches/icedtea-zero.patch | 37 diffs (truncated from 201693 to 500 lines): diff -r 4ae0b7d21b26 -r 4e6c7d065b1b ChangeLog --- a/ChangeLog Tue Mar 04 00:06:10 2008 -0500 +++ b/ChangeLog Tue Mar 04 07:02:39 2008 -0500 @@ -1,3 +1,16 @@ 2008-03-04 Lillian Angel + + * patches/icedtea-hotspot-6b06-7b24.patch: New file. + * patches/icedtea-hotspot7-build-fixes.patch: Likewise. + * patches/icedtea-bytecodeInterpreter.patch: Likewise. + * patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise. + * Makefile.am: Apply the above patches when zero is being built. + * Makefile.in: Regenerated. + + * patches/icedtea-linker-options.patch: Reinstate missing hunks. + * patches/icedtea-ports.patch: Likewise. + * patches/icedtea-zero.patch: Likewise. + 2008-03-04 Lillian Angel * generated/*: Updated generated files. diff -r 4ae0b7d21b26 -r 4e6c7d065b1b Makefile.am --- a/Makefile.am Tue Mar 04 00:06:10 2008 -0500 +++ b/Makefile.am Tue Mar 04 07:02:39 2008 -0500 @@ -194,7 +194,20 @@ else GCC_PATCH = patches/icedtea-gcc-4.3.patch endif +# If CORE_BUILD is set then we are building zero and need +# to patch up to OpenJDK 7 HotSpot for the C++ interpreter. +if CORE_BUILD + HOTSPOT_7_PATCHES = \ + patches/icedtea-hotspot-6b06-7b24.patch \ + patches/icedtea-hotspot7-build-fixes.patch \ + patches/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-bytecodeInterpreterWithChecks.patch +else + HOTSPOT_7_PATCHES = +endif + ICEDTEA_PATCHES = \ + $(HOTSPOT_7_PATCHES) \ patches/icedtea-copy-plugs.patch \ patches/icedtea-version.patch \ patches/icedtea-text-relocations.patch \ diff -r 4ae0b7d21b26 -r 4e6c7d065b1b Makefile.in --- a/Makefile.in Tue Mar 04 00:06:10 2008 -0500 +++ b/Makefile.in Tue Mar 04 07:02:39 2008 -0500 @@ -324,7 +324,18 @@ OPENJDK_URL = http://download.java.net/o # If new gcc is installed, apply 4.3 patch @GCC_OLD_TRUE at GCC_PATCH = + at CORE_BUILD_FALSE@HOTSPOT_7_PATCHES = + +# If CORE_BUILD is set then we are building zero and need +# to patch up to OpenJDK 7 HotSpot for the C++ interpreter. + at CORE_BUILD_TRUE@HOTSPOT_7_PATCHES = \ + at CORE_BUILD_TRUE@ patches/icedtea-hotspot-6b06-7b24.patch \ + at CORE_BUILD_TRUE@ patches/icedtea-hotspot7-build-fixes.patch \ + at CORE_BUILD_TRUE@ patches/icedtea-bytecodeInterpreter.patch \ + at CORE_BUILD_TRUE@ patches/icedtea-bytecodeInterpreterWithChecks.patch + ICEDTEA_PATCHES = \ + $(HOTSPOT_7_PATCHES) \ patches/icedtea-copy-plugs.patch \ patches/icedtea-version.patch \ patches/icedtea-text-relocations.patch \ diff -r 4ae0b7d21b26 -r 4e6c7d065b1b patches/icedtea-bytecodeInterpreter.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-bytecodeInterpreter.patch Tue Mar 04 07:02:39 2008 -0500 @@ -0,0 +1,36 @@ +diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp Fri Nov 02 10:14:32 2007 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp Fri Nov 02 10:15:45 2007 +0000 +@@ -60,7 +60,6 @@ + }; + + class BytecodeInterpreter : StackObj { +-friend class SharedRuntime; + friend class AbstractInterpreterGenerator; + friend class CppInterpreterGenerator; + friend class InterpreterGenerator; +diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Nov 02 15:08:47 2007 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Nov 02 15:21:08 2007 +0000 +@@ -518,16 +518,16 @@ + + /* 0xC0 */ &&opc_checkcast, &&opc_instanceof, &&opc_monitorenter, &&opc_monitorexit, + /* 0xC4 */ &&opc_wide, &&opc_multianewarray, &&opc_ifnull, &&opc_ifnonnull, +-/* 0xC8 */ &&opc_goto_w, &&opc_jsr_w, &&opc_breakpoint, &&opc_fast_igetfield, +-/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0, &&opc_fast_iaccess_0, &&opc__fast_aaccess_0, +- +-/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer, &&opc_default, ++/* 0xC8 */ &&opc_goto_w, &&opc_jsr_w, &&opc_breakpoint, &&opc_default, ++/* 0xCC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, ++ ++/* 0xD0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + /* 0xD4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + /* 0xD8 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + + /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, +-/* 0xE4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, ++/* 0xE4 */ &&opc_default, &&opc_return_register_finalizer, &&opc_default, &&opc_default, + /* 0xE8 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, + diff -r 4ae0b7d21b26 -r 4e6c7d065b1b patches/icedtea-bytecodeInterpreterWithChecks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-bytecodeInterpreterWithChecks.patch Tue Mar 04 07:02:39 2008 -0500 @@ -0,0 +1,18 @@ +--- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-12 03:46:08.000000000 -0400 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-29 11:57:33.000000000 -0400 +@@ -6,6 +6,7 @@ + + + ++ + + + #define VM_JVMTI +@@ -15,7 +16,6 @@ + + + +- + + + diff -r 4ae0b7d21b26 -r 4e6c7d065b1b patches/icedtea-hotspot-6b06-7b24.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-hotspot-6b06-7b24.patch Tue Mar 04 07:02:39 2008 -0500 @@ -0,0 +1,201186 @@ +diff -ruN openjdk{6,}/hotspot/src/share +diff -ruN openjdk{6,}/hotspot/src/os/linux + +diff -ruN openjdk6/hotspot/src/share/tools/MakeDeps/ArgsParser.java openjdk/hotspot/src/share/tools/MakeDeps/ArgsParser.java +--- openjdk6/hotspot/src/share/tools/MakeDeps/ArgsParser.java 2008-02-28 05:02:31.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/MakeDeps/ArgsParser.java 2008-01-31 09:19:00.000000000 -0500 +@@ -19,67 +19,67 @@ + * 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. +- * ++ * + */ + + class ArgIterator { + String[] args; + int i; + ArgIterator(String[] args) { +- this.args = args; +- this.i = 0; ++ this.args = args; ++ this.i = 0; + } +- String get() { return args[i]; } ++ String get() { return args[i]; } + boolean hasMore() { return args != null && i < args.length; } +- boolean next() { return ++i < args.length; } ++ boolean next() { return ++i < args.length; } + } + +-abstract class ArgHandler { ++abstract class ArgHandler { + public abstract void handle(ArgIterator it); +- ++ + } + + class ArgRule { + String arg; + ArgHandler handler; + ArgRule(String arg, ArgHandler handler) { +- this.arg = arg; +- this.handler = handler; ++ this.arg = arg; ++ this.handler = handler; + } + + boolean process(ArgIterator it) { +- if (match(it.get(), arg)) { +- handler.handle(it); +- return true; +- } +- return false; ++ if (match(it.get(), arg)) { ++ handler.handle(it); ++ return true; ++ } ++ return false; + } + boolean match(String rule_pattern, String arg) { +- return arg.equals(rule_pattern); ++ return arg.equals(rule_pattern); + } + } + + class ArgsParser { +- ArgsParser(String[] args, +- ArgRule[] rules, +- ArgHandler defaulter) { +- ArgIterator ai = new ArgIterator(args); +- while (ai.hasMore()) { +- boolean processed = false; +- for (int i=0; i References: Message-ID: <20080304120909.GD5247@redhat.com> Hi all, This is the zero-on-OpenJDK6 commit. It now works, on my machine at least ;) By the way, to whoever upgrades to the next OpenJDK release, don't try and rebase icedtea-hotspot-6b06-7b24.patch on it. This patch needs to be generated from scratch for every release. Cheers, Gary From jsumali at redhat.com Tue Mar 4 04:09:20 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 04 Mar 2008 07:09:20 -0500 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali References: <47CCC5C1.6090300@redhat.com> Message-ID: <47CD3BF0.7050207@redhat.com> Lillian Angel wrote: > I think these files should have been committed. As you see, one > contains the lesstif fix (windows decorations). The original sources > have been changed- thus the generated files have been changed. Ah alright. I was under the assumption that since we had the patch in patches/, it would just apply itself each time and re-generate anyways. > We can get rid of the lesstif patch as well. > > > Lillian > > Josh From jsumali at redhat.com Tue Mar 4 04:18:23 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 04 Mar 2008 07:18:23 -0500 Subject: changeset in /hg/icedtea6: 2008-03-03 Joshua Sumali References: <20080304104347.GA5247@redhat.com> Message-ID: <47CD3E0F.5010301@redhat.com> Gary Benson wrote: > Hi Josh, > > You lost a chunk of the tzdata patch with this commit > > diff -r 5e96a8bfa20f openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp > --- a/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp > +++ b/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp > @@ -397,10 +397,6 @@ void os::init_system_properties_values() > Argu