Fix sun-jdk compiling

5 files changed, 84 insertions, 6 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index feabb111c0e7..152372538d5e 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.57 2004/02/08 16:49:37 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.58 2004/02/10 10:20:03 pauldv Exp $
+
+  10 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r3.ebuild,
+  openoffice-1.1.1b.ebuild, files/1.1.0/openoffice-java.patch,
+  files/1.1.1b/openoffice-java.patch:
+  A patch to fix compiling with sun-jdk. Thanks to jgonzalez@opentechnet.com in
+  bug #40942
 
 *openoffice-1.1.1b (08 Feb 2004)
 
diff --git a/app-office/openoffice/files/1.1.0/openoffice-java.patch b/app-office/openoffice/files/1.1.0/openoffice-java.patch
new file mode 100644
index 000000000000..46a6e9734aa6
--- /dev/null
+++ b/app-office/openoffice/files/1.1.0/openoffice-java.patch
@@ -0,0 +1,36 @@
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-10 01:00:11.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-09 11:19:53.000000000 +0100
+@@ -200,7 +200,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-10 01:00:48.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-09 11:20:15.000000000 +0100
+@@ -207,7 +207,7 @@
+    index--;
+   }
+ 
+-  public org.openide.WizardDescriptor$Panel current()
++  public org.openide.WizardDescriptor.Panel current()
+    {
+      return panels[index];
+    }
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-10 01:01:29.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-09 11:20:35.000000000 +0100
+@@ -214,7 +214,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
diff --git a/app-office/openoffice/files/1.1.1b/openoffice-java.patch b/app-office/openoffice/files/1.1.1b/openoffice-java.patch
new file mode 100644
index 000000000000..46a6e9734aa6
--- /dev/null
+++ b/app-office/openoffice/files/1.1.1b/openoffice-java.patch
@@ -0,0 +1,36 @@
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-10 01:00:11.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-09 11:19:53.000000000 +0100
+@@ -200,7 +200,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-10 01:00:48.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-09 11:20:15.000000000 +0100
+@@ -207,7 +207,7 @@
+    index--;
+   }
+ 
+-  public org.openide.WizardDescriptor$Panel current()
++  public org.openide.WizardDescriptor.Panel current()
+    {
+      return panels[index];
+    }
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-10 01:01:29.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-09 11:20:35.000000000 +0100
+@@ -214,7 +214,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
diff --git a/app-office/openoffice/openoffice-1.1.0-r3.ebuild b/app-office/openoffice/openoffice-1.1.0-r3.ebuild
index a1c5883c3c36..9d7c9b39f096 100644
--- a/app-office/openoffice/openoffice-1.1.0-r3.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r3.ebuild,v 1.6 2004/02/05 10:34:16 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r3.ebuild,v 1.7 2004/02/10 10:20:03 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -263,6 +263,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PV}/nptl.patch
 
+	epatch ${FILESDIR}/${PV}/openoffice-java.patch
+
 	epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch
 
 	if [ ${ARCH} = "sparc" ]; then
diff --git a/app-office/openoffice/openoffice-1.1.1b.ebuild b/app-office/openoffice/openoffice-1.1.1b.ebuild
index 1cbe3360aa0d..5c50aef59961 100644
--- a/app-office/openoffice/openoffice-1.1.1b.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1b.ebuild,v 1.1 2004/02/08 16:49:38 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1b.ebuild,v 1.2 2004/02/10 10:20:03 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -260,11 +260,9 @@ src_unpack() {
 	rm stlport/STLport-4.5.3.patch
 	epatch ${FILESDIR}/${PV}/newstlportfix.patch
 
-#	epatch ${FILESDIR}/${PV}/no-mozab.patch
-
 	epatch ${FILESDIR}/${PV}/nptl.patch
 
-#	epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch
+	epatch ${FILESDIR}/${PV}/openoffice-java.patch
 
 #	if [ ${ARCH} = "sparc" ]; then
 #		epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch