From gbenson at redhat.com  Thu Nov  1 08:03:04 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 01 Nov 2007 15:03:04 +0000
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson  <gbenson@redh...
Message-ID: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>

changeset fb428e9dbfa6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
description:
	2007-11-01  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 8 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    4 ----
configure    |    4 ----

diffs (40 lines):

diff -r a62d79e2140c -r fb428e9dbfa6 ChangeLog
--- a/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
+++ b/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-31  Joshua Sumali  <jsumali at redh
+2007-11-01  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
+	* configure: Regenerated.
+
 2007-10-31  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
diff -r a62d79e2140c -r fb428e9dbfa6 acinclude.m4
--- a/acinclude.m4	Wed Oct 31 16:43:46 2007 -0400
+++ b/acinclude.m4	Thu Nov 01 11:02:51 2007 -0400
@@ -17,10 +17,6 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r a62d79e2140c -r fb428e9dbfa6 configure
--- a/configure	Wed Oct 31 16:43:46 2007 -0400
+++ b/configure	Thu Nov 01 11:02:51 2007 -0400
@@ -4840,10 +4840,6 @@ fi
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR

From twisti at complang.tuwien.ac.at  Fri Nov  2 07:34:43 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Fri, 02 Nov 2007 15:34:43 +0100
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson 
	<gbenson@redh...
In-Reply-To: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
Message-ID: <1194014083.15194.0.camel@localhost.localdomain>

On Thu, 2007-11-01 at 15:03 +0000, Gary Benson wrote:
> changeset fb428e9dbfa6 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
> description:
> 	2007-11-01  Gary Benson  <gbenson at redhat.com>
> 
> 		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.

Why did you remove s390?

- twisti


From gbenson at redhat.com  Fri Nov  2 07:50:53 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 2 Nov 2007 14:50:53 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194014083.15194.0.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
Message-ID: <20071102145053.GA3733@redhat.com>

Christian Thalinger wrote:
> On Thu, 2007-11-01 at 15:03 +0000, Gary Benson wrote:
> > changeset fb428e9dbfa6 in /hg/icedtea
> > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
> > description:
> > 	2007-11-01  Gary Benson  <gbenson at redhat.com>
> > 
> > 		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
> 
> Why did you remove s390?

Because it was broken.  It merged s390 and s390x in the same way
as ppc and ppc64 used to be merged, and I assumed no-one was using
it since ppc had been changed but s390 had not.

Are you using it?

Cheers,
Gary

From langel at redhat.com  Fri Nov  2 13:00:31 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 02 Nov 2007 20:00:31 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Lillian Angel  <langel@red...
Message-ID: <hg.4bb9761d77a8.1194033631.-6899778133799504387@icedtea.classpath.org>

changeset 4bb9761d77a8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4bb9761d77a8
description:
	2007-11-02  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Added patch to remove conflicting
	        definition of uLong. This fixes the build on 64-bit.

diffstat:

2 files changed, 73 insertions(+), 44 deletions(-)
ChangeLog                       |    5 +
patches/icedtea-libraries.patch |  112 +++++++++++++++++++++++----------------

diffs (138 lines):

diff -r fb428e9dbfa6 -r 4bb9761d77a8 ChangeLog
--- a/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
+++ b/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
@@ -1,3 +1,8 @@ 2007-11-01  Gary Benson  <gbenson at redhat
+2007-11-02  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Added patch to remove conflicting
+	definition of uLong. This fixes the build on 64-bit.
+
 2007-11-01  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
diff -r fb428e9dbfa6 -r 4bb9761d77a8 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Nov 01 11:02:51 2007 -0400
+++ b/patches/icedtea-libraries.patch	Fri Nov 02 15:59:43 2007 -0400
@@ -164,50 +164,6 @@
  
  #
  # Library to compile.
---- openjdk.old/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
-+++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-22 15:08:03.000000000 -0400
-@@ -64,20 +64,18 @@
-   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
- 
-   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
--
--  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--  OTHER_CXXFLAGS += $(ZINCLUDE)
--  LDDFLAGS += $(ZIPOBJS)
-+            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-+
-+  OTHER_LDLIBS += -lz
- else
-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-   OTHER_LDLIBS += $(JVMLIB)
-@@ -101,7 +99,7 @@
-   COMPILER_WARNINGS_FATAL=false
- else
-   LDOUTPUT = -o #Have a space 
--  LDDFLAGS += -lc
-+  LDDFLAGS += -lz -lc
-   OTHER_LDLIBS  += $(LIBCXX)
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), linux)
 --- openjdk.old/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-22 15:21:32.000000000 -0400
 @@ -35,7 +35,7 @@
@@ -25514,3 +25470,71 @@ diff -ruN openjdk.old/j2se/src/share/nat
      }
  
      if (scale != NULL) {
+--- oldopenjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
++++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-11-02 14:59:13.000000000 -0400
+@@ -64,23 +64,21 @@
+   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+ 
+   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
++
++  OTHER_LDLIBS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+-  OTHER_LDLIBS += $(JVMLIB)
++  OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+ 
+ CXXFLAGS_DBG += -DFULL
+@@ -101,12 +99,12 @@
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+-  LDDFLAGS += -lc
++  LDDFLAGS += -lz -lc
+   OTHER_LDLIBS  += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+-  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+--- oldopenjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-10-12 04:03:44.000000000 -0400
++++ openjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-11-02 15:48:45.000000000 -0400
+@@ -87,11 +87,7 @@
+ // bytes and byte arrays
+ 
+ typedef unsigned int uint;
+-#ifdef _LP64
+-typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+-#else
+ typedef unsigned long uLong;
+-#endif
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
+ typedef DWORDLONG 	julong;

From jsumali at redhat.com  Fri Nov  2 13:55:01 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Fri, 02 Nov 2007 20:55:01 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Joshua Sumali  <jsumali@re...
Message-ID: <hg.95a271d04351.1194036900.-6899778133799504387@icedtea.classpath.org>

changeset 95a271d04351 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=95a271d04351
description:
	2007-11-02  Joshua Sumali  <jsumali at redhat.com>

	        * rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
	        now implemented.
	        * rt/com/sun/media/sound/JDK13Services.java: Likewise.
	        * rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDevice.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiUtils.java: Likewise.
	        * rt/com/sun/media/sound/PortMixer.java: Likewise.
	        * rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
	        * rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.

diffstat:

11 files changed, 14 insertions(+), 533 deletions(-)
ChangeLog                                           |   14 +++
rt/com/sun/media/sound/DataPusher.java              |   62 -----------------
rt/com/sun/media/sound/JDK13Services.java           |   62 -----------------
rt/com/sun/media/sound/JavaSoundAudioClip.java      |   68 -------------------
rt/com/sun/media/sound/MidiInDevice.java            |   45 ------------
rt/com/sun/media/sound/MidiInDeviceProvider.java    |   45 ------------
rt/com/sun/media/sound/MidiOutDeviceProvider.java   |   45 ------------
rt/com/sun/media/sound/MidiUtils.java               |   59 ----------------
rt/com/sun/media/sound/PortMixer.java               |   45 ------------
rt/com/sun/media/sound/PortMixerProvider.java       |   45 ------------
rt/com/sun/media/sound/ReferenceCountingDevice.java |   57 ---------------

diffs (truncated from 594 to 500 lines):

diff -r 4bb9761d77a8 -r 95a271d04351 ChangeLog
--- a/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
+++ b/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
@@ -1,3 +1,17 @@ 2007-11-02  Lillian Angel  <langel at redha
+2007-11-02  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
+	now implemented.
+	* rt/com/sun/media/sound/JDK13Services.java: Likewise.
+	* rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDevice.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiUtils.java: Likewise.
+	* rt/com/sun/media/sound/PortMixer.java: Likewise.
+	* rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
+	* rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.
+
 2007-11-02  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Added patch to remove conflicting
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/DataPusher.java
--- a/rt/com/sun/media/sound/DataPusher.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* DataPusher.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.SourceDataLine;
-
-public class DataPusher {
-
-	public DataPusher(SourceDataLine sourcedataline, AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void start() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/JDK13Services.java
--- a/rt/com/sun/media/sound/JDK13Services.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* JDK13Services.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-import java.util.List;
-
-public class JDK13Services {
-
-	public static String getDefaultProviderClassName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static String getDefaultInstanceName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static List getProviders(Class providerClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/JavaSoundAudioClip.java
--- a/rt/com/sun/media/sound/JavaSoundAudioClip.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/* JavaSoundAudioClip.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-import java.applet.AudioClip;
-import java.io.InputStream;
-
-public class JavaSoundAudioClip implements AudioClip {
-
-	public JavaSoundAudioClip(InputStream in) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void loop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void play() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiInDevice.java
--- a/rt/com/sun/media/sound/MidiInDevice.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-public class MidiInDevice
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiInDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiInDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-public class MidiInDeviceProvider
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiOutDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiOutDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiOutDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-public class MidiOutDeviceProvider
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiUtils.java
--- a/rt/com/sun/media/sound/MidiUtils.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* MidiUtils.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.Sequence;
-
-public class MidiUtils {
-
-	public static final byte META_END_OF_TRACK_TYPE = 0;
-
-	public static long tick2microsecond(Sequence sequence, long tickLength, Object object) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static boolean isMetaEndOfTrack(MidiMessage message) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/PortMixer.java
--- a/rt/com/sun/media/sound/PortMixer.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-public class PortMixer
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/PortMixerProvider.java
--- a/rt/com/sun/media/sound/PortMixerProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixerProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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

From bero at arklinux.org  Fri Nov  2 16:35:37 2007
From: bero at arklinux.org (Bernhard Rosenkraenzer)
Date: Sat, 3 Nov 2007 00:35:37 +0100
Subject: [PATCH] Use openjdk b23
Message-ID: <200711030035.38976.bero@arklinux.org>

SSIA...

Due to the large size of the patch, I'm not posting it to the list, it can be 
downloaded at

http://arklinux.org/~bero/icedtea-309-openjdk-b23.patch.bz2

The patch is against an icedtea checkout from a couple of days ago (rev 309), 
might need slight adjustments with today's changes to icedtea-libraries.patch

Regards,
bero

From bero at arklinux.org  Fri Nov  2 16:53:55 2007
From: bero at arklinux.org (Bernhard Rosenkraenzer)
Date: Sat, 3 Nov 2007 00:53:55 +0100
Subject: [PATCH] make it compile with gcc 4.3
Message-ID: <200711030053.56163.bero@arklinux.org>

This patch (relative to hg from 2 days ago + my patch to switch it to b23) 
makes icedtea build with gcc 4.3.

Some chunks are fairly crappy (just getting rid of -Werror because openjdk 
code is nowhere near clean enough to compile with -Werror on gcc 4.3 --- lots 
of warnings saying the likes of
"cast from short to unsigned int:3 may change value"), the other bits are 
mostly adding missing includes (e.g. libstdc++'s <string> no longer includes 
<cstring>/<string.h>, causing gcc to complain about lack of memcpy/strlen/... 
prototypes.

Regards,
bero
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-1.4-gcc-4.3.patch
Type: text/x-diff
Size: 4568 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071103/99e77cb1/attachment.bin 

From twisti at complang.tuwien.ac.at  Mon Nov  5 02:46:20 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 05 Nov 2007 11:46:20 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071102145053.GA3733@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
Message-ID: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>

On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > Why did you remove s390?
> 
> Because it was broken.  It merged s390 and s390x in the same way
> as ppc and ppc64 used to be merged, and I assumed no-one was using
> it since ppc had been changed but s390 had not.

True, missed that.  The default case maps the correct architecture
anyways.

- twisti

From gbenson at redhat.com  Mon Nov  5 03:05:35 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 5 Nov 2007 11:05:35 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071105110535.GA3954@redhat.com>

Christian Thalinger wrote:
> On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > Why did you remove s390?
> > 
> > Because it was broken.  It merged s390 and s390x in the same way
> > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > it since ppc had been changed but s390 had not.
> 
> True, missed that.  The default case maps the correct architecture
> anyways.

Can I leave it to you to put it back how you want it?
I don't like to commit things when I don't know what's needed...

Cheers,
Gary

From amitksaha at netbeans.org  Mon Nov  5 03:26:18 2007
From: amitksaha at netbeans.org (Amit Kumar Saha)
Date: Mon, 5 Nov 2007 16:56:18 +0530
Subject: IcedTea interview
Message-ID: <547db2260711050326x4824a357s1ceb82d28b30fde0@mail.gmail.com>

Hi all!

I am working on an article on "IcedTea" for an India based Linux/Open
Source Magazine. Though, the FAQ answers most questions related to
"IcedTea", it would be nice to have an interview with the "IcedTea"
developers answering some of them in a "first person" fashion.

So, I would like to request you to kindly chip in with your thoughts:

* The main motivation behind IcedTea
* What is the future agenda?
* Are there plans to support other distributions as well?

Any other things you would like to be covered.

I really appreciate your time and comments.

Thank you very much!

Regards,
Amit



-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com

From twisti at complang.tuwien.ac.at  Mon Nov  5 04:31:19 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 05 Nov 2007 13:31:19 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071105110535.GA3954@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071105110535.GA3954@redhat.com>
Message-ID: <1194265879.16845.13.camel@c1.complang.tuwien.ac.at>

On Mon, 2007-11-05 at 11:05 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > Why did you remove s390?
> > > 
> > > Because it was broken.  It merged s390 and s390x in the same way
> > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > it since ppc had been changed but s390 had not.
> > 
> > True, missed that.  The default case maps the correct architecture
> > anyways.
> 
> Can I leave it to you to put it back how you want it?
> I don't like to commit things when I don't know what's needed...

Yes, I'll take care of it.

- twisti

From gbenson at redhat.com  Mon Nov  5 05:56:07 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 5 Nov 2007 13:56:07 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194265879.16845.13.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071105110535.GA3954@redhat.com>
	<1194265879.16845.13.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071105135607.GB3954@redhat.com>

Christian Thalinger wrote:
> On Mon, 2007-11-05 at 11:05 +0000, Gary Benson wrote:
> > Christian Thalinger wrote:
> > > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > > Why did you remove s390?
> > > > 
> > > > Because it was broken.  It merged s390 and s390x in the same way
> > > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > > it since ppc had been changed but s390 had not.
> > > 
> > > True, missed that.  The default case maps the correct architecture
> > > anyways.
> > 
> > Can I leave it to you to put it back how you want it?
> > I don't like to commit things when I don't know what's needed...
> 
> Yes, I'll take care of it.

Cool

From amitsaha.in at gmail.com  Mon Nov  5 03:22:22 2007
From: amitsaha.in at gmail.com (Amit Kumar Saha)
Date: Mon, 5 Nov 2007 16:52:22 +0530
Subject: IcedTea interview
Message-ID: <547db2260711050322l39594836t5756d4d2eb8d693@mail.gmail.com>

Hi all!

I am working on an article on "IcedTea" for an India based Linux/Open
Source Magazine. Though, the FAQ answers most questions related to
"IcedTea", it would be nice to have an interview with the "IcedTea"
developers answering some of them in a "first person" fashion.

So, I would like to request you to kindly chip in with your thoughts:

* The main motivation behind IcedTea
* What is the future agenda?
* Are there plans to support other distributions as well?

Any other things you would like to be covered.

I really appreciate your time and comments.

Thank you very much!

Regards,
Amit



-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com

From langel at redhat.com  Mon Nov  5 07:21:26 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 05 Nov 2007 10:21:26 -0500
Subject: [PATCH] Use openjdk b23
In-Reply-To: <200711030035.38976.bero@arklinux.org>
References: <200711030035.38976.bero@arklinux.org>
Message-ID: <472F34F6.7000404@redhat.com>

Hi,

Thanks for your patches. We are putting off the upgrade to b23 at the 
moment, because of the major build changes that would interfere with 
other on-going issues. We are working on re-implementing the ecj 
bootstrapping support into the build and ppc integration.

I will try out your patch at a later time and think about merging it. 
Another possibility is committing it to a separate branch.


Thanks again,
Lillian



Bernhard Rosenkraenzer wrote:
> SSIA...
> 
> Due to the large size of the patch, I'm not posting it to the list, it can be 
> downloaded at
> 
> http://arklinux.org/~bero/icedtea-309-openjdk-b23.patch.bz2
> 
> The patch is against an icedtea checkout from a couple of days ago (rev 309), 
> might need slight adjustments with today's changes to icedtea-libraries.patch
> 
> Regards,
> bero

From fitzsim at redhat.com  Mon Nov  5 12:41:28 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Mon, 05 Nov 2007 15:41:28 -0500
Subject: RFC: GConf Preference Backend for IcedTea
In-Reply-To: <1193790094.4755.10.camel@nirvana.limasoftware.net>
References: <1193790094.4755.10.camel@nirvana.limasoftware.net>
Message-ID: <472F7FF8.4060300@redhat.com>

Mario Torre wrote:
> hehe, it seems like I'm going back in time with this :)
> 
> I've just finished to port the GConf backend to IcedTea, so sorry for
> cross posting, but I think it's a good news for both Classpath and
> IcedTea.
> 
> I'm asking for comment because I'm not a configure expert, so may very
> well be that this is not the perfect way to handle things.
> 
> I've tested with few applications and all seems correct, the code is
> pretty much the same as the Classpath version. I've not tested it as
> concern the security model. I say this because I've seen that the
> FileBasedPreferences in openjdk does a little more checks on the
> SecurityManager than what we do. I want to check this carefully, but
> other than that, I think it's ok as is.
> 
> This thing works that way, if the user issues a --disable-gconf-peer to
> configure, nothing happens and the backend is not compiled. Otherwise,
> the backend is compiled and a shared object is created and then copied
> in the jre tree (much like we do with gcjwebplugin). Also, a patch is
> applied to call this backend on Linux and Solaris.
> 
> I'm waiting for comments, thanks,

+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so  \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
+	fi

Makefile.am sections that test for ${ENABLE_GCONF_PEER} should use the
CREATE_GCONF_PEER_LIBRARIES conditional instead.

@@ -221,6 +240,12 @@ icedtea-debug: stamps/bootstrap-director
  	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
  	cp -af gcjwebplugin.so \
  	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
+	fi

Copy-n-paste errors: you want $(BUILD_OUTPUT_DIR)-debug here.

+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+          if [ ! -d "rt/gnu" ]; then \
+            mkdir -p rt/gnu ; \
+          fi ;\
+          cp -arf gconf-prefs-peer/gnu/* rt/gnu ;\
+        fi ; \

You could just commit the new Java source files under rt.

+AC_CONFIG_FILES([Makefile
+gconf-prefs-peer/Makefile
+gconf-prefs-peer/native/Makefile])

These files aren't included in the patch.  Can they be inlined in
the top-level Makefile.am?

+AC_ARG_ENABLE([gconf-peer],
...

You could just assume that GConf2 is installed in the system,
like we already do for similar dependencies.

+static void
+throw_exception_by_name (JNIEnv * env, const char *name, const char *msg);

The function name shouldn't be at the start of a line in a
declaration, only in a definition.

+ * Factory object that generates a Preferences nodes that are read from a GConf
+ * daemon.

Typo: "a Preferences nodes".

Some general comments:

In the future, try not to include generated files in patch
submissions.

I'd like the security situation cleared up before this patch goes
in.  For example, can untrusted applets read or write GConf2
preferences with the patch as-is?

Have you tested with the Swing GTK PLAF to ensure your use of the
GDK lock doesn't interfere?  Have you investigated retrieving the
default GConfBackendVTable and using its lock/unlock functions
instead?

Tom

From gbenson at redhat.com  Tue Nov  6 03:58:10 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 6 Nov 2007 11:58:10 +0000
Subject: package org.omg.CORBA_2_3.portable does not exist
In-Reply-To: <200710161555.02689.bero@arklinux.org>
References: <200710151342.53740.bero@arklinux.org>
	<18195.21702.312045.341227@zebedee.pink>
	<200710161555.02689.bero@arklinux.org>
Message-ID: <20071106115810.GA3734@redhat.com>

Bernhard Rosenkraenzer wrote:
> On Monday 15 October 2007, you wrote:
> > Bernhard Rosenkraenzer writes:
> > > I've just tried to bootstrap icedtea (current hg) with gcj 4.3
> > > from SVN (the first semi-official gcc with generics support).
> >
> > It can't be done.  The current icedTea needs to be bootstrapped
> > with IcedTea.  We're thinking about how to solve this problem,
> > but it's hard.
> 
> Thanks, that helped -- I got IcedTea 1.3 to compile with gcj 4.3
> (just minor tweaks required - mostly it's a matter of killing the
> -Werror flag because gcc 4.3 introduces quite a few new warniongs).
> 
> Using the resulting JVM to bootstrap current hg icedtea still fails though:
> 
> /usr/src/ark/BUILD/icedtea/bootstrap/jdk1.6.0/bin/java -client -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -jar /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes -sourcepath /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes @/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/tmp/java/java.lang.management/management/.classes.list
> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:39: package org.omg.CORBA_2_3.portable does not exist
> import org.omg.CORBA_2_3.portable.InputStream;
>                                  ^
> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:42: 
> package org.omg.CORBA_2_3.portable does not exist
...

I got stuck on this.  It's the second -Xbootclasspath that kills it,
the one that says -Xbootclasspath:/path/to/linux-i586/classes, and
sure enough the CORBA_2_3 classes aren't in there.  It's a weird one
in that it only seems to happen on a clean build, so you'll hit the
error, do something, rebuild, "cool, that fixed it", then get bitten
by it all over again when you do a clean build.  But this patch seems
to fix it.

Cheers,
Gary
-------------- next part --------------
diff -r 45ea734f4db6 openjdk/corba/make/org/omg/CORBA/Makefile
--- openjdk/corba/make/org/omg/CORBA/Makefile	Tue Nov 06 08:51:19 2007 +0000
+++ openjdk/corba/make/org/omg/CORBA/Makefile	Tue Nov 06 09:39:33 2007 +0000
@@ -47,8 +47,8 @@ endif
 endif
 
 FILES_java = \
-        $(ORG_OMG_SENDINGCONTEXT_java) \
-        $(ORG_OMG_CORBA_2_3_java) \
+        $(org_omg_SENDINGCONTEXT_java) \
+        $(org_omg_CORBA_2_3_java) \
         $(ORG_OMG_CORBA_java)
 
 #

From gbenson at redhat.com  Tue Nov  6 04:44:43 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 6 Nov 2007 12:44:43 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071106124443.GB3734@redhat.com>

Christian Thalinger wrote:
> On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > Why did you remove s390?
> > 
> > Because it was broken.  It merged s390 and s390x in the same way
> > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > it since ppc had been changed but s390 had not.
> 
> True, missed that.  The default case maps the correct architecture
> anyways.

Oh, I didn't realise what you meant by that, but it just dawned on me
that the ppc cases are also redundant in that they do exactly what the
default case does.  Mind if I remove them too?

Cheers,
Gary

From twisti at complang.tuwien.ac.at  Wed Nov  7 02:45:57 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Wed, 07 Nov 2007 11:45:57 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071106124443.GB3734@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
Message-ID: <1194432357.32318.0.camel@localhost.localdomain>

On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > Why did you remove s390?
> > > 
> > > Because it was broken.  It merged s390 and s390x in the same way
> > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > it since ppc had been changed but s390 had not.
> > 
> > True, missed that.  The default case maps the correct architecture
> > anyways.
> 
> Oh, I didn't realise what you meant by that, but it just dawned on me
> that the ppc cases are also redundant in that they do exactly what the
> default case does.  Mind if I remove them too?

No, that not true.  The PowerPC cases map powerpc to ppc and powerpc64
to ppc64.  We need them.

- twisti


From gbenson at redhat.com  Wed Nov  7 03:04:15 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 7 Nov 2007 11:04:15 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194432357.32318.0.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
Message-ID: <20071107110415.GA3656@redhat.com>

Christian Thalinger wrote:
> On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > Oh, I didn't realise what you meant by that, but it just dawned on
> > me that the ppc cases are also redundant in that they do exactly
> > what the default case does.  Mind if I remove them too?
> 
> No, that not true.  The PowerPC cases map powerpc to ppc and
> powerpc64 to ppc64.  We need them.

The default case handles that mapping though:

  case "${host}" in
    x86_64-*-*)
      BUILD_ARCH_DIR=amd64
      INSTALL_ARCH_DIR=amd64
      ;;
    i?86-*-*)
      BUILD_ARCH_DIR=i586
      INSTALL_ARCH_DIR=i386
      ;;
    *)
      BUILD_ARCH_DIR=`uname -m`
      INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
      ;;
  esac

This is what I'm using at the moment.

Cheers,
Gary

From twisti at complang.tuwien.ac.at  Wed Nov  7 03:18:11 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Wed, 07 Nov 2007 12:18:11 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071107110415.GA3656@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
	<20071107110415.GA3656@redhat.com>
Message-ID: <1194434291.32318.5.camel@localhost.localdomain>

On Wed, 2007-11-07 at 11:04 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > > Oh, I didn't realise what you meant by that, but it just dawned on
> > > me that the ppc cases are also redundant in that they do exactly
> > > what the default case does.  Mind if I remove them too?
> > 
> > No, that not true.  The PowerPC cases map powerpc to ppc and
> > powerpc64 to ppc64.  We need them.
> 
> The default case handles that mapping though:
> 
>   case "${host}" in
>     x86_64-*-*)
>       BUILD_ARCH_DIR=amd64
>       INSTALL_ARCH_DIR=amd64
>       ;;
>     i?86-*-*)
>       BUILD_ARCH_DIR=i586
>       INSTALL_ARCH_DIR=i386
>       ;;
>     *)
>       BUILD_ARCH_DIR=`uname -m`
>       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
>       ;;
>   esac
> 
> This is what I'm using at the moment.

Ahh, I missed that we're using `uname -m' and not the host triplet.
Sorry.  Yes, then we can remove it.

- twisti


From gbenson at redhat.com  Wed Nov  7 03:56:33 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 07 Nov 2007 11:56:33 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Gary Benson  <gbenson@redh...
Message-ID: <hg.6117d91ad783.1194436593.-6899778133799504387@icedtea.classpath.org>

changeset 6117d91ad783 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6117d91ad783
description:
	2007-11-07  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 16 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    8 --------
configure    |    8 --------

diffs (48 lines):

diff -r 95a271d04351 -r 6117d91ad783 ChangeLog
--- a/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
+++ b/ChangeLog	Wed Nov 07 11:56:25 2007 +0000
@@ -1,3 +1,8 @@ 2007-11-02  Joshua Sumali  <jsumali at redh
+2007-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
+	* configure: Regenerated.
+
 2007-11-02  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
diff -r 95a271d04351 -r 6117d91ad783 acinclude.m4
--- a/acinclude.m4	Fri Nov 02 12:53:15 2007 -0400
+++ b/acinclude.m4	Wed Nov 07 11:56:25 2007 +0000
@@ -8,14 +8,6 @@ AC_DEFUN([SET_ARCH_DIRS],
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
-      ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
diff -r 95a271d04351 -r 6117d91ad783 configure
--- a/configure	Fri Nov 02 12:53:15 2007 -0400
+++ b/configure	Wed Nov 07 11:56:25 2007 +0000
@@ -4832,14 +4832,6 @@ fi
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR

From gbenson at redhat.com  Wed Nov  7 03:58:08 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 7 Nov 2007 11:58:08 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194434291.32318.5.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
	<20071107110415.GA3656@redhat.com>
	<1194434291.32318.5.camel@localhost.localdomain>
Message-ID: <20071107115807.GB3656@redhat.com>

Christian Thalinger wrote:
> On Wed, 2007-11-07 at 11:04 +0000, Gary Benson wrote:
> > Christian Thalinger wrote:
> > > On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > > > Oh, I didn't realise what you meant by that, but it just
> > > > dawned on me that the ppc cases are also redundant in that
> > > > they do exactly what the default case does.  Mind if I remove
> > > > them too?
> > > 
> > > No, that not true.  The PowerPC cases map powerpc to ppc and
> > > powerpc64 to ppc64.  We need them.
> > 
> > The default case handles that mapping though:
> > 
> >   case "${host}" in
> >     x86_64-*-*)
> >       BUILD_ARCH_DIR=amd64
> >       INSTALL_ARCH_DIR=amd64
> >       ;;
> >     i?86-*-*)
> >       BUILD_ARCH_DIR=i586
> >       INSTALL_ARCH_DIR=i386
> >       ;;
> >     *)
> >       BUILD_ARCH_DIR=`uname -m`
> >       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
> >       ;;
> >   esac
> > 
> > This is what I'm using at the moment.
> 
> Ahh, I missed that we're using `uname -m' and not the host triplet.
> Sorry.  Yes, then we can remove it.

Done :)

Cheers,
Gary

From langel at redhat.com  Wed Nov  7 05:42:22 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 08:42:22 -0500
Subject: package org.omg.CORBA_2_3.portable does not exist
In-Reply-To: <20071106115810.GA3734@redhat.com>
References: <200710151342.53740.bero@arklinux.org>	<18195.21702.312045.341227@zebedee.pink>	<200710161555.02689.bero@arklinux.org>
	<20071106115810.GA3734@redhat.com>
Message-ID: <4731C0BE.5060702@redhat.com>



Gary Benson wrote:
> Bernhard Rosenkraenzer wrote:
>> On Monday 15 October 2007, you wrote:
>>> Bernhard Rosenkraenzer writes:
>>>> I've just tried to bootstrap icedtea (current hg) with gcj 4.3
>>>> from SVN (the first semi-official gcc with generics support).
>>> It can't be done.  The current icedTea needs to be bootstrapped
>>> with IcedTea.  We're thinking about how to solve this problem,
>>> but it's hard.
>> Thanks, that helped -- I got IcedTea 1.3 to compile with gcj 4.3
>> (just minor tweaks required - mostly it's a matter of killing the
>> -Werror flag because gcc 4.3 introduces quite a few new warniongs).
>>
>> Using the resulting JVM to bootstrap current hg icedtea still fails though:
>>
>> /usr/src/ark/BUILD/icedtea/bootstrap/jdk1.6.0/bin/java -client -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -jar /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes -sourcepath /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes @/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/tmp/java/java.lang.management/management/.classes.list
>> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:39: package org.omg.CORBA_2_3.portable does not exist
>> import org.omg.CORBA_2_3.portable.InputStream;
>>                                  ^
>> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:42: 
>> package org.omg.CORBA_2_3.portable does not exist
> ...
> 
> I got stuck on this.  It's the second -Xbootclasspath that kills it,
> the one that says -Xbootclasspath:/path/to/linux-i586/classes, and
> sure enough the CORBA_2_3 classes aren't in there.  It's a weird one
> in that it only seems to happen on a clean build, so you'll hit the
> error, do something, rebuild, "cool, that fixed it", then get bitten
> by it all over again when you do a clean build.  But this patch seems
> to fix it.

I have also come across this issue while re-implementing ecj support. 
I will commit it with the rest of my stuff when it is ready.

Thanks,
Lillian

From langel at redhat.com  Wed Nov  7 08:23:47 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:47 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.26d6cb7b4b56.1194452627.-6899778133799504387@icedtea.classpath.org>

changeset 26d6cb7b4b56 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=26d6cb7b4b56
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * README: Updated.

diffstat:

2 files changed, 5 insertions(+), 2 deletions(-)
ChangeLog |    4 ++++
README    |    3 +--

diffs (27 lines):

diff -r 173cae44913b -r 26d6cb7b4b56 ChangeLog
--- a/ChangeLog	Tue Oct 23 13:27:20 2007 +0200
+++ b/ChangeLog	Thu Oct 18 10:12:12 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* README: Updated.
 
 2007-10-17  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
diff -r 173cae44913b -r 26d6cb7b4b56 README
--- a/README	Tue Oct 23 13:27:20 2007 +0200
+++ b/README	Thu Oct 18 10:12:12 2007 -0400
@@ -21,8 +21,7 @@ binary plugs.
 binary plugs.
 
 IcedTea also provides build scripts and patches that allow the source
-code from openjdk.java.net to be built with ecj running on libgcj or
-with IcedTea itself.
+code from openjdk.java.net to be built with IcedTea itself.
 
 See INSTALL for build instructions.
 

From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-22  Lillian Angel  <langel@red...
Message-ID: <hg.7304808731d0.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 7304808731d0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7304808731d0
description:
	2007-10-22  Lillian Angel  <langel at redhat.com>

	        * INSTALL: Updated requirements.
	        * Makefile.am: Updated patch list.
	        * Makefile.in: Regenerated.
	        * configure: Regenerated.
	        * configure.ac: Added checks for libpng, libjpeg, zlib and giflib.
	        * patches/icedtea-libraries.patch: New patch to remove built-in
	        libraries (libpng, libjpeg, zlib, giflib) and use system installed libs.
	        * patches/icedtea-libpng.patch: Removed (combined with previous patch).

diffstat:

7 files changed, 747 insertions(+), 16 deletions(-)
ChangeLog                       |   11 
INSTALL                         |    4 
Makefile.am                     |    2 
configure                       |  284 ++++++++++++++++++++++++-
configure.ac                    |    8 
patches/icedtea-libpng.patch    |   11 
patches/icedtea-libraries.patch |  443 +++++++++++++++++++++++++++++++++++++++

diffs (truncated from 856 to 500 lines):

diff -r cee826c52531 -r 7304808731d0 ChangeLog
--- a/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
+++ b/ChangeLog	Mon Oct 22 16:00:02 2007 -0400
@@ -3,6 +3,17 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-22  Lillian Angel  <langel at redhat.com>
+
+	* INSTALL: Updated requirements.
+	* Makefile.am: Updated patch list.
+	* Makefile.in: Regenerated.
+	* configure: Regenerated.
+	* configure.ac: Added checks for libpng, libjpeg, zlib and giflib.
+	* patches/icedtea-libraries.patch: New patch to remove built-in
+	libraries (libpng, libjpeg, zlib, giflib) and use system installed libs.
+	* patches/icedtea-libpng.patch: Removed (combined with previous patch).
 
 2007-10-19  Joshua Sumali  <jsumali at redhat.com>
 
diff -r cee826c52531 -r 7304808731d0 INSTALL
--- a/INSTALL	Fri Oct 19 12:33:26 2007 -0400
+++ b/INSTALL	Mon Oct 22 16:00:02 2007 -0400
@@ -26,6 +26,10 @@ gtk2-devel
 gtk2-devel
 ant >= 1.6.5
 libXinerama-devel
+giflib-devel
+libpng-devel
+libjpeg-devel
+zlib-devel
 java-1.7.0-icedtea-devel (or IcedTea <= b19 built)
 
 See ./configure --help if you need to override defaults.
diff -r cee826c52531 -r 7304808731d0 Makefile.am
--- a/Makefile.am	Fri Oct 19 12:33:26 2007 -0400
+++ b/Makefile.am	Mon Oct 22 16:00:02 2007 -0400
@@ -136,7 +136,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-debuginfo.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-license-headers.patch \
-	patches/icedtea-libpng.patch \
 	patches/icedtea-plugin.patch \
 	patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch \
@@ -152,6 +151,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-sunsrc.patch \
+	patches/icedtea-libraries.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r cee826c52531 -r 7304808731d0 configure
--- a/configure	Fri Oct 19 12:33:26 2007 -0400
+++ b/configure	Mon Oct 22 16:00:02 2007 -0400
@@ -6934,6 +6934,282 @@ fi
 fi
 
 
+{ echo "$as_me:$LINENO: checking for main in -lpng" >&5
+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6; }
+if test "${ac_cv_lib_png_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_png_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_png_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
+echo "${ECHO_T}$ac_cv_lib_png_main" >&6; }
+if test $ac_cv_lib_png_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPNG 1
+_ACEOF
+
+  LIBS="-lpng $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libpng not found - try installing libpng-devel\"" >&5
+echo "$as_me: error: \"libpng not found - try installing libpng-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jpeg_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_jpeg_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_jpeg_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6; }
+if test $ac_cv_lib_jpeg_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJPEG 1
+_ACEOF
+
+  LIBS="-ljpeg $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libjpeg not found - try installing libjpeg-devel\"" >&5
+echo "$as_me: error: \"libjpeg not found - try installing libjpeg-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -lgif" >&5
+echo $ECHO_N "checking for main in -lgif... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gif_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgif  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_gif_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_gif_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_main" >&5
+echo "${ECHO_T}$ac_cv_lib_gif_main" >&6; }
+if test $ac_cv_lib_gif_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGIF 1
+_ACEOF
+
+  LIBS="-lgif $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libgif not found - try installing libgif-devel\"" >&5
+echo "$as_me: error: \"libgif not found - try installing libgif-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -lz" >&5
+echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6; }
+if test "${ac_cv_lib_z_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_z_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_z_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
+echo "${ECHO_T}$ac_cv_lib_z_main" >&6; }
+if test $ac_cv_lib_z_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"zlib not found - try installing zlib-devel\"" >&5
+echo "$as_me: error: \"zlib not found - try installing zlib-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -7600,7 +7876,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7610,7 +7886,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -7711,7 +7987,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7721,7 +7997,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
diff -r cee826c52531 -r 7304808731d0 configure.ac
--- a/configure.ac	Fri Oct 19 12:33:26 2007 -0400
+++ b/configure.ac	Mon Oct 22 16:00:02 2007 -0400
@@ -75,6 +75,14 @@ AC_CHECK_LIB(Xtst, XTestQueryExtension,
 	, [AC_MSG_ERROR("libXtst not found - try installing libXtst-devel")])
 AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	, [AC_MSG_ERROR("libXinerama not found - try installing libXinerama-devel")])
+AC_CHECK_LIB(png, main,
+        , [AC_MSG_ERROR("libpng not found - try installing libpng-devel")])
+AC_CHECK_LIB(jpeg, main,
+        , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")])
+AC_CHECK_LIB(gif, main,
+        , [AC_MSG_ERROR("libgif not found - try installing libgif-devel")])
+AC_CHECK_LIB(z, main,
+	, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
 
 dnl Check for plugin support headers and libraries.
 PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \
diff -r cee826c52531 -r 7304808731d0 patches/icedtea-libpng.patch
--- a/patches/icedtea-libpng.patch	Fri Oct 19 12:33:26 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk.orig/j2se/make/sun/splashscreen/Makefile	2007-08-19 15:04:21.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-08-19 15:08:45.000000000 -0400
-@@ -59,7 +59,7 @@
- # C Flags
- #
- 
--CFLAGS += -DSPLASHSCREEN
-+CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
- 
- ifneq ($(PLATFORM), windows)
-   CFLAGS += -DWITH_X11
diff -r cee826c52531 -r 7304808731d0 patches/icedtea-libraries.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-libraries.patch	Mon Oct 22 16:00:02 2007 -0400
@@ -0,0 +1,443 @@
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2007-10-22 12:50:36.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "../libpng/png.h"
++#include <png.h>
+ 
+ #include <setjmp.h>
+ 
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2007-10-22 12:50:36.000000000 -0400
+@@ -26,7 +26,7 @@
+ #include "splashscreen_impl.h"
+ #include "splashscreen_gfx.h"
+ 
+-#include "../giflib/gif_lib.h"
++#include <gif_lib.h>
+ 
+ #define GIF_TRANSPARENT     0x01
+ #define GIF_USER_INPUT      0x02
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-22 12:50:36.000000000 -0400
+@@ -25,11 +25,9 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-#include "jerror.h"
+-
++#include <jerror.h>
+ #include <setjmp.h>
++#include <jpeglib.h>
+ 
+ /* stream input handling */
+ 
+@@ -105,13 +103,9 @@
+     stream_src_ptr src;
+ 
+     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
+-        cinfo->src = (struct jpeg_source_mgr *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
++        cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
+         src = (stream_src_ptr) cinfo->src;
+-        src->buffer = (JOCTET *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
++        src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
+     }
+ 
+     src = (stream_src_ptr) cinfo->src;
+--- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-22 12:50:36.000000000 -0400
+@@ -23,53 +23,7 @@
+ # have any questions.
+ #
+ 
+-FILES_c = \
+-	imageioJPEG.c \
+-	jpegdecoder.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \

From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.6595cc8bc5ab.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 6595cc8bc5ab in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6595cc8bc5ab
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * Makefile.am (OPENJDK_SOURCEPATH_DIRS): Added CORBA sources.

diffstat:

3 files changed, 8 insertions(+), 2 deletions(-)
ChangeLog   |    4 ++++
Makefile.am |    3 ++-
Makefile.in |    3 ++-

diffs (43 lines):

diff -r 26d6cb7b4b56 -r 6595cc8bc5ab ChangeLog
--- a/ChangeLog	Thu Oct 18 10:12:12 2007 -0400
+++ b/ChangeLog	Thu Oct 18 11:31:12 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am (OPENJDK_SOURCEPATH_DIRS): Added CORBA sources.
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 26d6cb7b4b56 -r 6595cc8bc5ab Makefile.am
--- a/Makefile.am	Thu Oct 18 10:12:12 2007 -0400
+++ b/Makefile.am	Thu Oct 18 11:31:12 2007 -0400
@@ -324,9 +324,10 @@ SOLARIS = openjdk/j2se/src/solaris/class
 SOLARIS = openjdk/j2se/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA)
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
diff -r 26d6cb7b4b56 -r 6595cc8bc5ab Makefile.in
--- a/Makefile.in	Thu Oct 18 10:12:12 2007 -0400
+++ b/Makefile.in	Thu Oct 18 11:31:12 2007 -0400
@@ -292,8 +292,9 @@ SOLARIS = openjdk/j2se/src/solaris/class
 SOLARIS = openjdk/j2se/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA)
 
 all: all-am
 

From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-22  Lillian Angel  <langel@red...
Message-ID: <hg.335f71762c44.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 335f71762c44 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=335f71762c44
description:
	2007-10-22  Lillian Angel  <langel at redhat.com>

	        * configure.ac: Fixed typo. libgif should be giflib.
	        * configure: Regenerate.

diffstat:

3 files changed, 12 insertions(+), 7 deletions(-)
ChangeLog    |    5 +++++
configure    |   12 ++++++------
configure.ac |    2 +-

diffs (77 lines):

diff -r 7304808731d0 -r 335f71762c44 ChangeLog
--- a/ChangeLog	Mon Oct 22 16:00:02 2007 -0400
+++ b/ChangeLog	Mon Oct 22 16:10:10 2007 -0400
@@ -3,6 +3,11 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-22  Lillian Angel  <langel at redhat.com>
+
+	* configure.ac: Fixed typo. libgif should be giflib.
+	* configure: Regenerate.
 
 2007-10-22  Lillian Angel  <langel at redhat.com>
 
diff -r 7304808731d0 -r 335f71762c44 configure
--- a/configure	Mon Oct 22 16:00:02 2007 -0400
+++ b/configure	Mon Oct 22 16:10:10 2007 -0400
@@ -7135,8 +7135,8 @@ _ACEOF
   LIBS="-lgif $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: \"libgif not found - try installing libgif-devel\"" >&5
-echo "$as_me: error: \"libgif not found - try installing libgif-devel\"" >&2;}
+  { { echo "$as_me:$LINENO: error: \"giflib not found - try installing giflib-devel\"" >&5
+echo "$as_me: error: \"giflib not found - try installing giflib-devel\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -7876,7 +7876,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7886,7 +7886,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -7987,7 +7987,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7997,7 +7997,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
diff -r 7304808731d0 -r 335f71762c44 configure.ac
--- a/configure.ac	Mon Oct 22 16:00:02 2007 -0400
+++ b/configure.ac	Mon Oct 22 16:10:10 2007 -0400
@@ -80,7 +80,7 @@ AC_CHECK_LIB(jpeg, main,
 AC_CHECK_LIB(jpeg, main,
         , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")])
 AC_CHECK_LIB(gif, main,
-        , [AC_MSG_ERROR("libgif not found - try installing libgif-devel")])
+        , [AC_MSG_ERROR("giflib not found - try installing giflib-devel")])
 AC_CHECK_LIB(z, main,
 	, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
 

From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.10ce9710bee5.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 10ce9710bee5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=10ce9710bee5
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * javac.in, javap.in: Removed

diffstat:

3 files changed, 4 insertions(+), 32 deletions(-)
ChangeLog |    4 ++++
javac.in  |   29 -----------------------------
javap.in  |    3 ---

diffs (54 lines):

diff -r 6595cc8bc5ab -r 10ce9710bee5 ChangeLog
--- a/ChangeLog	Thu Oct 18 11:31:12 2007 -0400
+++ b/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* javac.in, javap.in: Removed
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 6595cc8bc5ab -r 10ce9710bee5 javac.in
--- a/javac.in	Thu Oct 18 11:31:12 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-case "$*" in
-  *-bootclasspath*) ;;
-  *) bcoption="-bootclasspath @LIBGCJ_JAR@"
-esac
-
-# Work around ecj's inability to handle duplicate command-line
-# options.
-
-NEW_ARGS="$@"
-
-if echo "$@" | grep -q '\-source\ .*\-source\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-source\ *1\.[3456]//1'`
-fi
-
-if echo "$@" | grep -q '\-d\ .*\-d\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-d\ *[^\ ]*//1'`
-fi
-
-if echo "$@" | grep -q '\-encoding\ .*\-encoding\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-encoding\ *[^\ ]*//1'`
-fi
-
-CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
-  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
diff -r 6595cc8bc5ab -r 10ce9710bee5 javap.in
--- a/javap.in	Thu Oct 18 11:31:12 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0

From jsumali at redhat.com  Wed Nov  7 08:23:48 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-19  Joshua Sumali  <jsumali@re...
Message-ID: <hg.cee826c52531.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset cee826c52531 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cee826c52531
description:
	2007-10-19  Joshua Sumali  <jsumali at redhat.com>

	        * patches/icedtea-sunsrc.patch: New file.
	        * Makefile.am: Added icedtea-sunsrc to patch list.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 30 insertions(+)
ChangeLog                    |    6 ++++++
Makefile.am                  |    1 +
patches/icedtea-sunsrc.patch |   23 +++++++++++++++++++++++

diffs (54 lines):

diff -r 10ce9710bee5 -r cee826c52531 ChangeLog
--- a/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
+++ b/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
@@ -3,6 +3,12 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-19  Joshua Sumali  <jsumali at redhat.com>
+
+	* patches/icedtea-sunsrc.patch: New file.
+	* Makefile.am: Added icedtea-sunsrc to patch list.
+	* Makefile.in: Regenerated.
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 10ce9710bee5 -r cee826c52531 Makefile.am
--- a/Makefile.am	Thu Oct 18 16:04:37 2007 -0400
+++ b/Makefile.am	Fri Oct 19 12:33:26 2007 -0400
@@ -151,6 +151,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
+	patches/icedtea-sunsrc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 10ce9710bee5 -r cee826c52531 patches/icedtea-sunsrc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sunsrc.patch	Fri Oct 19 12:33:26 2007 -0400
@@ -0,0 +1,23 @@
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-17 16:06:30.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-18 14:47:55.000000000 -0400
+@@ -625,6 +625,10 @@
+ 	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
+ 		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
+ 	$(MV) $@.temp $@
++	$(CAT) $@ | $(GREP) "^sun" | $(GREP) "class" | $(GREP) -v '\$$' \
++	    > $(ABS_TEMPDIR)/sun_classes_list
++	sed 's/\.class/\.java/' < $(ABS_TEMPDIR)/sun_classes_list \
++	    > $(ABS_TEMPDIR)/sun_sources_list
+ 	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
+ 
+ # Create the rt.jar file list & non-class files list
+@@ -1002,6 +1006,9 @@
+ 	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
+ 	  fi; \
+ 	done
++	($(CD) $(SHARE_SRC)/classes && $(TAR) cf - -T \
++	    $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -);
+   else
+ 	for d in $(SOURCE_DIRS); do \
+ 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \

From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-24  Lillian Angel  <langel@red...
Message-ID: <hg.8d9b3ea59444.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 8d9b3ea59444 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d9b3ea59444
description:
	2007-10-24  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Updated jpeg patches to properly
	        create OpenJDK's libjpeg.so without files common to the system
	        installed libjpeg.so.

diffstat:

2 files changed, 25301 insertions(+), 222 deletions(-)
ChangeLog                       |    6 
patches/icedtea-libraries.patch |25517 ++++++++++++++++++++++++++++++++++++++-

diffs (truncated from 25551 to 500 lines):

diff -r 335f71762c44 -r 8d9b3ea59444 ChangeLog
--- a/ChangeLog	Mon Oct 22 16:10:10 2007 -0400
+++ b/ChangeLog	Wed Oct 24 22:28:39 2007 -0400
@@ -1,3 +1,9 @@ 2007-10-23  Christan Thalinger  <twisti@
+2007-10-24  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Updated jpeg patches to properly
+	create OpenJDK's libjpeg.so without files common to the system
+	installed libjpeg.so.
+
 2007-10-23  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
diff -r 335f71762c44 -r 8d9b3ea59444 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Mon Oct 22 16:10:10 2007 -0400
+++ b/patches/icedtea-libraries.patch	Wed Oct 24 22:28:39 2007 -0400
@@ -20,210 +20,6 @@
  
  #define GIF_TRANSPARENT     0x01
  #define GIF_USER_INPUT      0x02
---- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
-+++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-22 12:50:36.000000000 -0400
-@@ -25,11 +25,9 @@
- 
- #include "splashscreen_impl.h"
- 
--#include "jinclude.h"
--#include "jpeglib.h"
--#include "jerror.h"
--
-+#include <jerror.h>
- #include <setjmp.h>
-+#include <jpeglib.h>
- 
- /* stream input handling */
- 
-@@ -105,13 +103,9 @@
-     stream_src_ptr src;
- 
-     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
--        cinfo->src = (struct jpeg_source_mgr *)
--            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
--            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
-+        cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
-         src = (stream_src_ptr) cinfo->src;
--        src->buffer = (JOCTET *)
--            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
--            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
-+        src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
-     }
- 
-     src = (stream_src_ptr) cinfo->src;
---- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-22 12:50:36.000000000 -0400
-@@ -23,53 +23,7 @@
- # have any questions.
- #
- 
--FILES_c = \
--	imageioJPEG.c \
--	jpegdecoder.c \
--	jcomapi.c \
--	jdapimin.c \
--	jdapistd.c \
--	jdcoefct.c \
--	jdcolor.c \
--	jddctmgr.c \
--	jdhuff.c \
--	jdinput.c \
--	jdmainct.c \
--	jdmarker.c \
--	jdmaster.c \
--	jdmerge.c \
--	jdphuff.c \
--	jdpostct.c \
--	jdsample.c \
--	jerror.c \
--	jidctflt.c \
--	jidctfst.c \
--	jidctint.c \
--	jidctred.c \
--	jmemmgr.c \
--	jmemnobs.c \
--	jquant1.c \
--	jquant2.c \
--	jutils.c \
--	jcapimin.c \
--	jcapistd.c \
--	jccoefct.c \
--	jccolor.c \
--	jcdctmgr.c \
--	jchuff.c \
--	jcinit.c \
--	jcmainct.c \
--	jcmarker.c \
--	jcmaster.c \
--	jcparam.c \
--	jcphuff.c \
--	jcprepct.c \
--	jcsample.c \
--	jctrans.c \
--	jdtrans.c \
--	jfdctflt.c \
--	jfdctfst.c \
--	jfdctint.c
-+
- 
- ifndef OPENJDK
- FILES_c += \
---- openjdk.old/j2se/make/sun/splashscreen/Makefile	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-10-22 13:17:21.000000000 -0400
-@@ -59,12 +59,12 @@
- # C Flags
- #
- 
--CFLAGS += -DSPLASHSCREEN
-+CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
- 
- ifneq ($(PLATFORM), windows)
-   CFLAGS += -DWITH_X11
-   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
--  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-+  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
- else # PLATFORM
-   CFLAGS += -DWITH_WIN32
-   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
-@@ -76,12 +76,7 @@
- #
- vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
- vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
--vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
- vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
- 
- CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- 
---- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-22 13:18:28.000000000 -0400
-@@ -30,81 +30,5 @@
- 	splashscreen_impl.c \
- 	splashscreen_jpeg.c \
- 	splashscreen_png.c \
--	splashscreen_sys.c \
--	png.c \
--	pngerror.c \
--	pngget.c \
--	pngmem.c  \
--	pngpread.c \
--	pngread.c \
--	pngrio.c \
--	pngrtran.c \
--	pngrutil.c \
--	pngset.c \
--	pngtrans.c \
--	pngwio.c \
--	pngwrite.c \
--	pngwtran.c \
--	pngwutil.c \
--	dgif_lib.c \
--	gif_err.c \
--	gifalloc.c \
--	compress.c \
--	deflate.c \
--	gzio.c \
--	infblock.c \
--	infcodes.c \
--	inffast.c \
--	inflate.c \
--	inftrees.c \
--	infutil.c \
--	trees.c \
--	uncompr.c \
--	zadler32.c \
--	zcrc32.c \
--	zutil.c \
--	jcomapi.c \
--	jdapimin.c \
--	jdapistd.c \
--	jdcoefct.c \
--	jdcolor.c \
--	jddctmgr.c \
--	jdhuff.c \
--	jdinput.c \
--	jdmainct.c \
--	jdmarker.c \
--	jdmaster.c \
--	jdmerge.c \
--	jdphuff.c \
--	jdpostct.c \
--	jdsample.c \
--	jerror.c \
--	jidctflt.c \
--	jidctfst.c \
--	jidctint.c \
--	jidctred.c \
--	jmemmgr.c \
--	jmemnobs.c \
--	jquant1.c \
--	jquant2.c \
--	jutils.c \
--	jcapimin.c \
--	jcapistd.c \
--	jccoefct.c \
--	jccolor.c \
--	jcdctmgr.c \
--	jchuff.c \
--	jcinit.c \
--	jcmainct.c \
--	jcmarker.c \
--	jcmaster.c \
--	jcparam.c \
--	jcphuff.c \
--	jcprepct.c \
--	jcsample.c \
--	jctrans.c \
--	jdtrans.c \
--	jfdctflt.c \
--	jfdctfst.c \
--	jfdctint.c
-+	splashscreen_sys.c
- 
 --- openjdk.old/j2se/src/share/native/java/util/zip/Adler32.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Adler32.c	2007-10-22 13:21:09.000000000 -0400
 @@ -29,7 +29,7 @@
@@ -235,24 +31,6 @@
  
  #include "java_util_zip_Adler32.h"
  
---- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-22 13:22:05.000000000 -0400
-@@ -36,6 +36,7 @@
- #include <time.h>
- #include <ctype.h>
- #include <assert.h>
-+#include <zlib.h>
- 
- #include "jni.h"
- #include "jni_util.h"
-@@ -44,7 +45,6 @@
- #include "io_util.h"
- #include "io_util_md.h"
- #include "zip_util.h"
--#include "zlib.h"
- 
- /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
- #ifdef USE_MMAP
 --- openjdk.old/j2se/src/share/native/java/util/zip/Deflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Deflater.c	2007-10-22 13:22:34.000000000 -0400
 @@ -32,7 +32,7 @@
@@ -441,3 +219,25298 @@
  #include "java_util_zip_Inflater.h"
  
  #define ThrowDataFormatException(env, msg) \
+--- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-12 04:03:46.000000000 -0400
++++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-23 14:33:18.000000000 -0400
+@@ -44,7 +44,8 @@
+ #include "io_util.h"
+ #include "io_util_md.h"
+ #include "zip_util.h"
+-#include "zlib.h"
++
++#include <zlib.h>
+ 
+ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
+ #ifdef USE_MMAP
+--- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-23 16:15:48.000000000 -0400
+@@ -30,81 +30,5 @@
+ 	splashscreen_impl.c \
+ 	splashscreen_jpeg.c \
+ 	splashscreen_png.c \
+-	splashscreen_sys.c \
+-	png.c \
+-	pngerror.c \
+-	pngget.c \
+-	pngmem.c  \
+-	pngpread.c \
+-	pngread.c \
+-	pngrio.c \
+-	pngrtran.c \
+-	pngrutil.c \
+-	pngset.c \
+-	pngtrans.c \
+-	pngwio.c \
+-	pngwrite.c \
+-	pngwtran.c \
+-	pngwutil.c \
+-	dgif_lib.c \
+-	gif_err.c \
+-	gifalloc.c \
+-	compress.c \
+-	deflate.c \
+-	gzio.c \
+-	infblock.c \
+-	infcodes.c \
+-	inffast.c \
+-	inflate.c \
+-	inftrees.c \
+-	infutil.c \
+-	trees.c \
+-	uncompr.c \
+-	zadler32.c \
+-	zcrc32.c \
+-	zutil.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \
+-	jutils.c \
+-	jcapimin.c \
+-	jcapistd.c \
+-	jccoefct.c \
+-	jccolor.c \
+-	jcdctmgr.c \
+-	jchuff.c \
+-	jcinit.c \
+-	jcmainct.c \
+-	jcmarker.c \
+-	jcmaster.c \
+-	jcparam.c \
+-	jcphuff.c \
+-	jcprepct.c \
+-	jcsample.c \
+-	jctrans.c \
+-	jdtrans.c \
+-	jfdctflt.c \
+-	jfdctfst.c \
+-	jfdctint.c
++	splashscreen_sys.c 
+ 
+--- openjdk.old/j2se/make/sun/splashscreen/Makefile	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-10-23 16:20:24.000000000 -0400
+@@ -59,12 +59,12 @@
+ # C Flags
+ #
+ 
+-CFLAGS += -DSPLASHSCREEN
++CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
+ 
+ ifneq ($(PLATFORM), windows)
+   CFLAGS += -DWITH_X11
+   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+-  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
++  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
+ else # PLATFORM
+   CFLAGS += -DWITH_WIN32
+   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
+@@ -76,12 +76,8 @@
+ #
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
+-vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
+-vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+ 
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ 
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-23 16:29:30.000000000 -0400
+@@ -25,9 +25,8 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-#include "jerror.h"
++#include <jpeglib.h>
++#include <jerror.h>
+ 
+ #include <setjmp.h>
+ 
+@@ -105,13 +104,9 @@
+     stream_src_ptr src;
+ 
+     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
+-        cinfo->src = (struct jpeg_source_mgr *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
++        cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
+         src = (stream_src_ptr) cinfo->src;
+-        src->buffer = (JOCTET *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
++        src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
+     }
+ 
+     src = (stream_src_ptr) cinfo->src;
+diff -ruN openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk openjdk/j2se/make/sun/jpeg/FILES_c.gmk
+--- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-23 17:13:59.000000000 -0400
+@@ -25,51 +25,7 @@
+ 
+ FILES_c = \
+ 	imageioJPEG.c \
+-	jpegdecoder.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \
+-	jutils.c \
+-	jcapimin.c \
+-	jcapistd.c \
+-	jccoefct.c \
+-	jccolor.c \
+-	jcdctmgr.c \
+-	jchuff.c \
+-	jcinit.c \
+-	jcmainct.c \
+-	jcmarker.c \
+-	jcmaster.c \
+-	jcparam.c \
+-	jcphuff.c \
+-	jcprepct.c \
+-	jcsample.c \
+-	jctrans.c \
+-	jdtrans.c \
+-	jfdctflt.c \
+-	jfdctfst.c \
+-	jfdctint.c
++	jpegdecoder.c
+ 
+ ifndef OPENJDK
+ FILES_c += \
+diff -ruN openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c
+--- openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c	2007-10-12 04:03:48.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,284 +0,0 @@
+-/*
+- * reserved comment block
+- * DO NOT REMOVE OR ALTER!
+- */
+-/*
+- * jcapimin.c
+- *
+- * Copyright (C) 1994-1998, Thomas G. Lane.
+- * This file is part of the Independent JPEG Group's software.
+- * For conditions of distribution and use, see the accompanying README file.
+- *
+- * This file contains application interface code for the compression half
+- * of the JPEG library.  These are the "minimum" API routines that may be
+- * needed in either the normal full-compression case or the transcoding-only
+- * case.
+- *
+- * Most of the routines intended to be called directly by an application
+- * are in this file or in jcapistd.c.  But also see jcparam.c for
+- * parameter-setup helper routines, jcomapi.c for routines shared by
+- * compression and decompression, and jctrans.c for the transcoding case.
+- */
+-
+-#define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-
+-

From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-30  Lillian Angel  <langel@red...
Message-ID: <hg.f5f4a0462f74.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset f5f4a0462f74 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f5f4a0462f74
description:
	2007-10-30  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
	        fix cpp generated.
	        * patches/icedtea-javafiles.patch: New patch to add missing files to
	        the list.
	        * Makefile.am: Added patches to the list.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 126 insertions(+)
ChangeLog                                           |    9 +
Makefile.am                                         |    2 
patches/icedtea-bytecodeInterpreterWithChecks.patch |   18 +++
patches/icedtea-javafiles.patch                     |   97 +++++++++++++++++++

diffs (151 lines):

diff -r 8d9b3ea59444 -r f5f4a0462f74 ChangeLog
--- a/ChangeLog	Wed Oct 24 22:28:39 2007 -0400
+++ b/ChangeLog	Tue Oct 30 13:18:22 2007 -0400
@@ -1,3 +1,12 @@ 2007-10-24  Lillian Angel  <langel at redha
+2007-10-30  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
+	fix cpp generated.
+	* patches/icedtea-javafiles.patch: New patch to add missing files to
+	the list.
+	* Makefile.am: Added patches to the list.
+	* Makefile.in: Regenerated.
+
 2007-10-24  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Updated jpeg patches to properly
diff -r 8d9b3ea59444 -r f5f4a0462f74 Makefile.am
--- a/Makefile.am	Wed Oct 24 22:28:39 2007 -0400
+++ b/Makefile.am	Tue Oct 30 13:18:22 2007 -0400
@@ -152,6 +152,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
+	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-javafiles.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 8d9b3ea59444 -r f5f4a0462f74 patches/icedtea-bytecodeInterpreterWithChecks.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-bytecodeInterpreterWithChecks.patch	Tue Oct 30 13:18:22 2007 -0400
@@ -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
+@@ -8,6 +8,7 @@
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
++<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ <xsl:template match="processcode">
+ <xsl:text>
+ #define VM_JVMTI
+@@ -17,7 +18,6 @@
+
+ </xsl:text>
+
+-<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ </xsl:template>
+
+ </xsl:stylesheet>
diff -r 8d9b3ea59444 -r f5f4a0462f74 patches/icedtea-javafiles.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-javafiles.patch	Tue Oct 30 13:18:22 2007 -0400
@@ -0,0 +1,97 @@
+--- openjdk.old/j2se/make/java/java/FILES_java.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/java/java/FILES_java.gmk	2007-10-29 13:54:32.000000000 -0400
+@@ -29,6 +29,80 @@
+ # will generate header files
+ #
+ JAVA_JAVA_java = \
++    java/lang/reflect/AccessibleObject.java \
++    java/lang/reflect/AnnotatedElement.java \
++    java/lang/reflect/Array.java \
++    java/lang/reflect/Constructor.java \
++    java/lang/reflect/Field.java \
++    java/lang/reflect/GenericArrayType.java \
++    java/lang/reflect/GenericDeclaration.java \
++    java/lang/reflect/GenericSignatureFormatError.java \
++    java/lang/reflect/InvocationHandler.java \
++    java/lang/reflect/InvocationTargetException.java \
++    java/lang/reflect/MalformedParameterizedTypeException.java \
++    java/lang/reflect/Member.java \
++    java/lang/reflect/Method.java \
++    java/lang/reflect/Modifier.java \
++    java/lang/reflect/package-info.java \
++    java/lang/reflect/ParameterizedType.java \
++    java/lang/reflect/Proxy.java \
++    java/lang/reflect/ReflectAccess.java \
++    java/lang/reflect/ReflectPermission.java \
++    java/lang/reflect/Type.java \
++    java/lang/reflect/TypeVariable.java \
++    java/lang/reflect/UndeclaredThrowableException.java \
++    java/lang/reflect/WildcardType.java \
++    java/lang/ref/Finalizer.java \
++    java/lang/ref/FinalReference.java \
++    java/lang/ref/PhantomReference.java \
++    java/lang/ref/Reference.java \
++    java/lang/ref/ReferenceQueue.java \
++    java/lang/ref/SoftReference.java \
++    java/lang/ref/WeakReference.java \
++    java/lang/management/ClassLoadingMXBean.java \
++    java/lang/management/CompilationMXBean.java \
++    java/lang/management/GarbageCollectorMXBean.java \
++    java/lang/management/LockInfo.java \
++    java/lang/management/ManagementFactory.java \
++    java/lang/management/ManagementPermission.java \
++    java/lang/management/MemoryManagerMXBean.java \
++    java/lang/management/MemoryMXBean.java \
++    java/lang/management/MemoryNotificationInfo.java \
++    java/lang/management/MemoryPoolMXBean.java \
++    java/lang/management/MemoryType.java \
++    java/lang/management/MemoryUsage.java \
++    java/lang/management/MonitorInfo.java \
++    java/lang/management/OperatingSystemMXBean.java \
++    java/lang/management/RuntimeMXBean.java \
++    java/lang/management/ThreadInfo.java \
++    java/lang/management/ThreadMXBean.java \
++    java/lang/instrument/ClassDefinition.java \
++    java/lang/instrument/ClassFileTransformer.java \
++    java/lang/instrument/IllegalClassFormatException.java \
++    java/lang/instrument/Instrumentation.java \
++    java/lang/instrument/UnmodifiableClassException.java \
++    java/lang/annotation/AnnotationFormatError.java \
++    java/lang/annotation/Annotation.java \
++    java/lang/annotation/AnnotationTypeMismatchException.java \
++    java/lang/annotation/Documented.java \
++    java/lang/annotation/ElementType.java \
++    java/lang/annotation/IncompleteAnnotationException.java \
++    java/lang/annotation/Inherited.java \
++    java/lang/annotation/package-info.java \
++    java/lang/annotation/Retention.java \
++    java/lang/annotation/RetentionPolicy.java \
++    java/lang/annotation/Target.java \
++    java/io/IOError.java \
++    java/lang/Deprecated.java \
++    java/lang/Iterable.java \
++    java/util/RandomAccess.java \
++    java/lang/CharacterData00.java \
++    java/lang/CharacterData01.java \
++    java/lang/CharacterData02.java \
++    java/lang/CharacterData0E.java \
++    java/lang/CharacterDataLatin1.java \
++    java/lang/CharacterDataPrivateUse.java \
++    java/lang/CharacterDataUndefined.java \
+     java/lang/Object.java \
+     java/lang/Class.java \
+     java/lang/Thread.java \
+@@ -135,13 +209,6 @@
+     java/lang/Readable.java \
+     java/lang/Override.java \
+     java/lang/SuppressWarnings.java \
+-    java/lang/ref/Reference.java \
+-        java/lang/ref/SoftReference.java \
+-	java/lang/ref/WeakReference.java \
+-	java/lang/ref/FinalReference.java \
+-	java/lang/ref/PhantomReference.java \
+-    java/lang/ref/ReferenceQueue.java \
+-    java/lang/ref/Finalizer.java \
+     java/util/BitSet.java \
+     java/util/Calendar.java \
+         java/util/GregorianCalendar.java \

From jsumali at redhat.com  Wed Nov  7 08:23:49 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-31  Joshua Sumali  <jsumali@re...
Message-ID: <hg.101ceeb3c00e.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 101ceeb3c00e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=101ceeb3c00e
description:
	2007-10-31  Joshua Sumali  <jsumali at redhat.com>

	        * patches/icedtea-sunsrc.patch: Fixed patch to include some missing
	        sources.

diffstat:

2 files changed, 11 insertions(+), 7 deletions(-)
ChangeLog                    |    5 +++++
patches/icedtea-sunsrc.patch |   13 ++++++-------

diffs (41 lines):

diff -r f5f4a0462f74 -r 101ceeb3c00e ChangeLog
--- a/ChangeLog	Tue Oct 30 13:18:22 2007 -0400
+++ b/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-30  Lillian Angel  <langel at redha
+2007-10-31  Joshua Sumali  <jsumali at redhat.com>
+
+	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
+	sources.
+
 2007-10-30  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
diff -r f5f4a0462f74 -r 101ceeb3c00e patches/icedtea-sunsrc.patch
--- a/patches/icedtea-sunsrc.patch	Tue Oct 30 13:18:22 2007 -0400
+++ b/patches/icedtea-sunsrc.patch	Wed Oct 31 16:43:46 2007 -0400
@@ -1,5 +1,5 @@
---- openjdk.orig/j2se/make/common/Release.gmk	2007-10-17 16:06:30.000000000 -0400
-+++ openjdk/j2se/make/common/Release.gmk	2007-10-18 14:47:55.000000000 -0400
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-26 16:46:41.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-28 18:28:19.000000000 -0400
 @@ -625,6 +625,10 @@
  	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
  		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
@@ -11,13 +11,12 @@
  	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
  
  # Create the rt.jar file list & non-class files list
-@@ -1002,6 +1006,9 @@
+@@ -1001,6 +1005,8 @@
+ 	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
++	  (($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -)) > /dev/null 2>&1 ; \
  	done
-+	($(CD) $(SHARE_SRC)/classes && $(TAR) cf - -T \
-+	    $(ABS_TEMPDIR)/sun_sources_list ) \
-+	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -);
    else
  	for d in $(SOURCE_DIRS); do \
- 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \

From gbenson at redhat.com  Wed Nov  7 08:23:50 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson  <gbenson@redh...
Message-ID: <hg.fe120a194ddf.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset fe120a194ddf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fe120a194ddf
description:
	2007-11-01  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 8 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    4 ----
configure    |    4 ----

diffs (40 lines):

diff -r 101ceeb3c00e -r fe120a194ddf ChangeLog
--- a/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
+++ b/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-31  Joshua Sumali  <jsumali at redh
+2007-11-01  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
+	* configure: Regenerated.
+
 2007-10-31  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
diff -r 101ceeb3c00e -r fe120a194ddf acinclude.m4
--- a/acinclude.m4	Wed Oct 31 16:43:46 2007 -0400
+++ b/acinclude.m4	Thu Nov 01 11:02:51 2007 -0400
@@ -17,10 +17,6 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r 101ceeb3c00e -r fe120a194ddf configure
--- a/configure	Wed Oct 31 16:43:46 2007 -0400
+++ b/configure	Thu Nov 01 11:02:51 2007 -0400
@@ -4844,10 +4844,6 @@ fi
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR

From langel at redhat.com  Wed Nov  7 08:23:50 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Lillian Angel  <langel@red...
Message-ID: <hg.329dde099a8b.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset 329dde099a8b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=329dde099a8b
description:
	2007-11-02  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Added patch to remove conflicting
	        definition of uLong. This fixes the build on 64-bit.

diffstat:

2 files changed, 73 insertions(+), 44 deletions(-)
ChangeLog                       |    5 +
patches/icedtea-libraries.patch |  112 +++++++++++++++++++++++----------------

diffs (138 lines):

diff -r fe120a194ddf -r 329dde099a8b ChangeLog
--- a/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
+++ b/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
@@ -1,3 +1,8 @@ 2007-11-01  Gary Benson  <gbenson at redhat
+2007-11-02  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Added patch to remove conflicting
+	definition of uLong. This fixes the build on 64-bit.
+
 2007-11-01  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
diff -r fe120a194ddf -r 329dde099a8b patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Nov 01 11:02:51 2007 -0400
+++ b/patches/icedtea-libraries.patch	Fri Nov 02 15:59:43 2007 -0400
@@ -164,50 +164,6 @@
  
  #
  # Library to compile.
---- openjdk.old/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
-+++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-22 15:08:03.000000000 -0400
-@@ -64,20 +64,18 @@
-   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
- 
-   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
--
--  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--  OTHER_CXXFLAGS += $(ZINCLUDE)
--  LDDFLAGS += $(ZIPOBJS)
-+            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-+
-+  OTHER_LDLIBS += -lz
- else
-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-   OTHER_LDLIBS += $(JVMLIB)
-@@ -101,7 +99,7 @@
-   COMPILER_WARNINGS_FATAL=false
- else
-   LDOUTPUT = -o #Have a space 
--  LDDFLAGS += -lc
-+  LDDFLAGS += -lz -lc
-   OTHER_LDLIBS  += $(LIBCXX)
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), linux)
 --- openjdk.old/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-22 15:21:32.000000000 -0400
 @@ -35,7 +35,7 @@
@@ -25514,3 +25470,71 @@ diff -ruN openjdk.old/j2se/src/share/nat
      }
  
      if (scale != NULL) {
+--- oldopenjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
++++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-11-02 14:59:13.000000000 -0400
+@@ -64,23 +64,21 @@
+   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+ 
+   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
++
++  OTHER_LDLIBS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+-  OTHER_LDLIBS += $(JVMLIB)
++  OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+ 
+ CXXFLAGS_DBG += -DFULL
+@@ -101,12 +99,12 @@
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+-  LDDFLAGS += -lc
++  LDDFLAGS += -lz -lc
+   OTHER_LDLIBS  += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+-  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+--- oldopenjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-10-12 04:03:44.000000000 -0400
++++ openjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-11-02 15:48:45.000000000 -0400
+@@ -87,11 +87,7 @@
+ // bytes and byte arrays
+ 
+ typedef unsigned int uint;
+-#ifdef _LP64
+-typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+-#else
+ typedef unsigned long uLong;
+-#endif
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
+ typedef DWORDLONG 	julong;

From jsumali at redhat.com  Wed Nov  7 08:23:50 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Joshua Sumali  <jsumali@re...
Message-ID: <hg.20436247b1ac.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset 20436247b1ac in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=20436247b1ac
description:
	2007-11-02  Joshua Sumali  <jsumali at redhat.com>

	        * rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
	        now implemented.
	        * rt/com/sun/media/sound/JDK13Services.java: Likewise.
	        * rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDevice.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiUtils.java: Likewise.
	        * rt/com/sun/media/sound/PortMixer.java: Likewise.
	        * rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
	        * rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.

diffstat:

11 files changed, 14 insertions(+), 533 deletions(-)
ChangeLog                                           |   14 +++
rt/com/sun/media/sound/DataPusher.java              |   62 -----------------
rt/com/sun/media/sound/JDK13Services.java           |   62 -----------------
rt/com/sun/media/sound/JavaSoundAudioClip.java      |   68 -------------------
rt/com/sun/media/sound/MidiInDevice.java            |   45 ------------
rt/com/sun/media/sound/MidiInDeviceProvider.java    |   45 ------------
rt/com/sun/media/sound/MidiOutDeviceProvider.java   |   45 ------------
rt/com/sun/media/sound/MidiUtils.java               |   59 ----------------
rt/com/sun/media/sound/PortMixer.java               |   45 ------------
rt/com/sun/media/sound/PortMixerProvider.java       |   45 ------------
rt/com/sun/media/sound/ReferenceCountingDevice.java |   57 ---------------

diffs (truncated from 594 to 500 lines):

diff -r 329dde099a8b -r 20436247b1ac ChangeLog
--- a/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
+++ b/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
@@ -1,3 +1,17 @@ 2007-11-02  Lillian Angel  <langel at redha
+2007-11-02  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
+	now implemented.
+	* rt/com/sun/media/sound/JDK13Services.java: Likewise.
+	* rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDevice.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiUtils.java: Likewise.
+	* rt/com/sun/media/sound/PortMixer.java: Likewise.
+	* rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
+	* rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.
+
 2007-11-02  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Added patch to remove conflicting
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/DataPusher.java
--- a/rt/com/sun/media/sound/DataPusher.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* DataPusher.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.SourceDataLine;
-
-public class DataPusher {
-
-	public DataPusher(SourceDataLine sourcedataline, AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void start() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/JDK13Services.java
--- a/rt/com/sun/media/sound/JDK13Services.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* JDK13Services.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea 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, version 2.
-
-IcedTea 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 IcedTea; 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 th