--- a/ChangeLog	Mon Jul 14 18:24:57 2008 +0200
+++ b/ChangeLog	Mon Jul 14 16:26:08 2008 -0400
@@ -1,3 +1,10 @@
+2008-07-14  Joshua Sumali  <jsumali@redhat.com>
+
+	* Makefile.am (stamps/cacao.stamp): Only install if WITH_CACAO is used.
+	* patches/icedtea-liveconnect.patch: Split GetMemberPluginCallRequest,
+	GetWindowPluginCallRequest and VoidPluginCallRequest into separate files
+	to work around ecj compiling issues.
+
 2008-07-14  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (stamps/download.stamp): Disable checksum test and

--- a/Makefile.am	Mon Jul 14 18:24:57 2008 +0200
+++ b/Makefile.am	Mon Jul 14 16:26:08 2008 -0400
@@ -1134,6 +1134,7 @@
 	fi
 
 stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
+if WITH_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao-$(CACAO_VERSION) ; \
 	./configure \
@@ -1144,6 +1145,7 @@
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	make install
 endif
+endif
 	mkdir -p stamps
 	touch $@
 

--- a/patches/icedtea-liveconnect.patch	Mon Jul 14 18:24:57 2008 +0200
+++ b/patches/icedtea-liveconnect.patch	Mon Jul 14 16:26:08 2008 -0400
@@ -2212,111 +2212,6 @@
 + 	}
 +     }
 + }
-diff -urN openjdk/jdk/src/share/classes/sun/applet.orig/PluginCallRequest.java openjdk/jdk/src/share/classes/sun/applet/PluginCallRequest.java
---- openjdk/jdk/src/share/classes/sun/applet.orig/PluginCallRequest.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/applet/PluginCallRequest.java	2008-02-23 05:26:59.000000000 -0500
-@@ -0,0 +1,101 @@
-+/* PluginCallRequest -- represent Java-to-JavaScript requests
-+   Copyright (C) 2008  Red Hat
-+
-+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; either version 2, or (at your option)
-+any later version.
-+
-+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 sun.applet;
-+
-+// FIXME: for each type of request extend a new (anonymous?)
-+// PluginCallRequest.
-+abstract class PluginCallRequest {
-+    String message;
-+    String returnString;
-+    PluginCallRequest next;
-+    boolean done = false;
-+
-+    public PluginCallRequest(String message, String returnString) {
-+        this.message = message;
-+        this.returnString = returnString;
-+    }
-+
-+    public abstract void parseReturn(String message);
-+}
-+
-+class GetWindowPluginCallRequest extends PluginCallRequest {
-+    // FIXME: look into int vs long JavaScript internal values.
-+    int internal;
-+
-+    public GetWindowPluginCallRequest(String message, String returnString) {
-+        super(message, returnString);
-+    }
-+
-+    public void parseReturn(String message) {
-+        System.out.println ("GetWINDOWparseReturn GOT: " + message);
-+        String[] args = message.split(" ");
-+        // FIXME: add thread ID to messages to support multiple
-+        // threads using the netscape.javascript package.
-+        internal = Integer.parseInt(args[1]);
-+        done = true;
-+    }
-+}
-+
-+class GetMemberPluginCallRequest extends PluginCallRequest {
-+    Object object = null;
-+
-+    public GetMemberPluginCallRequest(String message, String returnString) {
-+        super(message, returnString);
-+        System.out.println ("GetMEMBerPLUGINCAlL " + message + " " + returnString);
-+    }
-+
-+    public void parseReturn(String message) {
-+        System.out.println ("GetMEMBerparseReturn GOT: " + message);
-+        String[] args = message.split(" ");
-+        // FIXME: add thread ID to messages to support multiple
-+        // threads using the netscape.javascript package.
-+        object = PluginAppletSecurityContext.contexts.get(
-+            0).store.getObject(Integer.parseInt(args[1]));
-+        done = true;
-+    }
-+}
-+class VoidPluginCallRequest extends PluginCallRequest {
-+    public VoidPluginCallRequest(String message, String returnString) {
-+        super(message, returnString);
-+        System.out.println ("VoidPLUGINCAlL " + message + " " + returnString);
-+    }
-+
-+    public void parseReturn(String message) {
-+        done = true;
-+    }
-+}
 diff -urN openjdk/jdk/src/share/classes/sun/applet.orig/PluginMain.java openjdk/jdk/src/share/classes/sun/applet/PluginMain.java
 --- openjdk/jdk/src/share/classes/sun/applet.orig/PluginMain.java	1969-12-31 19:00:00.000000000 -0500
 +++ openjdk/jdk/src/share/classes/sun/applet/PluginMain.java	2008-02-22 20:48:32.000000000 -0500
@@ -2900,3 +2795,232 @@
 +        return 899;
 +    }
 +}
+--- openjdk.orig/jdk/src/share/classes/sun/applet/PluginCallRequest.java	1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/sun/applet/PluginCallRequest.java	2008-07-14 11:06:02.000000000 -0400
+@@ -0,0 +1,54 @@
++/* PluginCallRequest -- represent Java-to-JavaScript requests
++   Copyright (C) 2008  Red Hat
++
++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; either version 2, or (at your option)
++any later version.
++
++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 sun.applet;
++
++// FIXME: for each type of request extend a new (anonymous?)
++// PluginCallRequest.
++abstract class PluginCallRequest {
++    String message;
++    String returnString;
++    PluginCallRequest next;
++    boolean done = false;
++
++    public PluginCallRequest(String message, String returnString) {
++        this.message = message;
++        this.returnString = returnString;
++    }
++
++    public abstract void parseReturn(String message);
++}
+--- openjdk.orig/jdk/src/share/classes/sun/applet/GetMemberPluginCallRequest.java	1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/sun/applet/GetMemberPluginCallRequest.java	2008-07-14 11:07:57.000000000 -0400
+@@ -0,0 +1,58 @@
++/* GetMemberPluginCallRequest -- represent Java-to-JavaScript requests
++   Copyright (C) 2008  Red Hat
++
++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; either version 2, or (at your option)
++any later version.
++
++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 sun.applet;
++
++class GetMemberPluginCallRequest extends PluginCallRequest {
++    Object object = null;
++
++    public GetMemberPluginCallRequest(String message, String returnString) {
++        super(message, returnString);
++        System.out.println ("GetMEMBerPLUGINCAlL " + message + " " + returnString);
++    }
++
++    public void parseReturn(String message) {
++        System.out.println ("GetMEMBerparseReturn GOT: " + message);
++        String[] args = message.split(" ");
++        // FIXME: add thread ID to messages to support multiple
++        // threads using the netscape.javascript package.
++        object = PluginAppletSecurityContext.contexts.get(
++            0).store.getObject(Integer.parseInt(args[1]));
++        done = true;
++    }
++}
++
+--- openjdk.orig/jdk/src/share/classes/sun/applet/GetWindowPluginCallRequest.java	1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/sun/applet/GetWindowPluginCallRequest.java	2008-07-14 11:08:07.000000000 -0400
+@@ -0,0 +1,56 @@
++/* GetWindowPluginCallRequest -- represent Java-to-JavaScript requests
++   Copyright (C) 2008  Red Hat
++
++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; either version 2, or (at your option)
++any later version.
++
++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 sun.applet;
++
++class GetWindowPluginCallRequest extends PluginCallRequest {
++    // FIXME: look into int vs long JavaScript internal values.
++    int internal;
++
++    public GetWindowPluginCallRequest(String message, String returnString) {
++        super(message, returnString);
++    }
++
++    public void parseReturn(String message) {
++        System.out.println ("GetWINDOWparseReturn GOT: " + message);
++        String[] args = message.split(" ");
++        // FIXME: add thread ID to messages to support multiple
++        // threads using the netscape.javascript package.
++        internal = Integer.parseInt(args[1]);
++        done = true;
++    }
++}
+--- openjdk.orig/jdk/src/share/classes/sun/applet/VoidPluginCallRequest.java	1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/sun/applet/VoidPluginCallRequest.java	2008-07-14 11:08:20.000000000 -0400
+@@ -0,0 +1,49 @@
++/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
++   Copyright (C) 2008  Red Hat
++
++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; either version 2, or (at your option)
++any later version.
++
++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 sun.applet;
++
++class VoidPluginCallRequest extends PluginCallRequest {
++    public VoidPluginCallRequest(String message, String returnString) {
++        super(message, returnString);
++        System.out.println ("VoidPLUGINCAlL " + message + " " + returnString);
++    }
++
++    public void parseReturn(String message) {
++        done = true;
++    }
++}