fix kde build problems

4 files changed, 151 insertions, 6 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 3afd8f8f6a3b..1e91b2397586 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.59 2004/08/20 22:09:23 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.60 2004/08/21 14:04:10 suka Exp $
+
+  21 Aug 2004; suka@gentoo.org +files/1.1.2/fpickerkdefix.diff,
+  openoffice-ximian-1.3.0.ebuild:
+  Fixes for the KDE stuff, so moving out of package.mask :-)
 
   21 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.0.patch,
   openoffice-ximian-1.3.0.ebuild:
diff --git a/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff b/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff
new file mode 100644
index 000000000000..2c9b31562bf2
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff
@@ -0,0 +1,138 @@
+--- patches/OOO_1_1/fpicker-common.diff
++++ patches/OOO_1_1/fpicker-common.diff
+@@ -5,9 +5,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $
+++ *  $Revision: 1.3 $
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -177,9 +177,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $
+++ *  $Revision: 1.3 $
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -311,9 +311,9 @@
+ +#
+ +#   $RCSfile: fpicker-common.diff,v $
+ +#
+-+#   $Revision: 1.2 $
+++#   $Revision: 1.3 $
+ +#
+-+#   last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++#   last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ +#
+ +#   The Contents of this file are made available subject to the terms of
+ +#   either of the following licenses
+@@ -414,9 +414,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $ 
+++ *  $Revision: 1.3 $ 
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -768,9 +768,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $
+++ *  $Revision: 1.3 $
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -828,12 +828,12 @@
+ +#ifndef _UNXCOMMANDTHREAD_HXX_
+ +#define _UNXCOMMANDTHREAD_HXX_
+ +
+-+#ifndef _COM_SUN_STAR_UNO_ANY_H_
+-+#include <com/sun/star/uno/Any.h>
+++#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
+++#include <com/sun/star/uno/Any.hxx>
+ +#endif
+ +
+-+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
+-+#include <com/sun/star/uno/Sequence.h>
+++#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
+++#include <com/sun/star/uno/Sequence.hxx>
+ +#endif
+ +
+ +#ifndef _OSL_CONDITN_HXX_
+@@ -913,9 +913,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $ 
+++ *  $Revision: 1.3 $ 
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -1894,9 +1894,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $
+++ *  $Revision: 1.3 $
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -2135,9 +2135,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $ 
+++ *  $Revision: 1.3 $ 
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -2288,9 +2288,9 @@
+ + *
+ + *  $RCSfile: fpicker-common.diff,v $
+ + *
+-+ *  $Revision: 1.2 $
+++ *  $Revision: 1.3 $
+ + *
+-+ *  last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $
+++ *  last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -2352,8 +2352,8 @@
+ +#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
+ +#endif
+ +
+-+#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
+-+#include <com/sun/star/uno/Reference.h>
+++#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
+++#include <com/sun/star/uno/Reference.hxx>
+ +#endif
+ +
+ +#ifndef _OSL_CONDITN_HXX_
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0
index 0a8937fa90ef..ee91ebaa81d2 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0
@@ -1,4 +1,4 @@
 MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989
 MD5 9772e0deeb9f25dca34a71ad321de4cb ooo-build-1.3.0.tar.gz 2649158
-MD5 50486f5208ec5ae7af1dbb8f9e77cb12 ooo-KDE_icons-OOO_1_1-0.2.tar.gz 1024910
+MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540
 MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild
index 79375bd809eb..7ad4eb0d251f 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild,v 1.3 2004/08/20 22:09:23 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild,v 1.4 2004/08/21 14:04:10 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -33,8 +33,8 @@ IUSE="gnome kde ooo-kde"
 OO_VER=1.1.2
 PATCHLEVEL=OOO_1_1_2
 ICON_VER=OOO_1_1-10
-KDE_ICON_VER=OOO_1_1-0.2
-KDE_ICON_PATH=documents/159/1929
+KDE_ICON_VER=OOO_1_1-0.3
+KDE_ICON_PATH=documents/159/1975
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
 S="${WORKDIR}/oo_${OO_VER}_src"
@@ -225,8 +225,11 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${A}
 
-	#Beginnings of our own patchset
+	#Fix build issues
 	cd ${PATCHDIR}
+	epatch ${FILESDIR}/${OO_VER}/fpickerkdefix.diff
+
+	#Beginnings of our own patchset
 	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
 
 	#Still needed: The STLport patch