next try

3 files changed, 118 insertions, 118 deletions

diff --git a/app-office/openoffice-ximian/files/1.1.2/nativefix.diff b/app-office/openoffice-ximian/files/1.1.2/nativefix.diff
new file mode 100644
index 000000000000..ed609db6b8dc
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.2/nativefix.diff
@@ -0,0 +1,116 @@
+--- nativewidgets-vcl.diff
++++ nativewidgets-vcl.diff
+@@ -3924,9 +3924,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -4021,9 +4021,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -4399,9 +4399,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -4667,9 +4667,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -4758,14 +4758,14 @@
+ unchanged:
+ --- /dev/null	2003-09-23 19:59:22.000000000 +0200
+ +++ vcl/unx/source/gdi/salnativewidgets-gtk.cxx	2004-03-03 15:32:34.000000000 +0100
+-@@ -0,0 +1,2163 @@
++@@ -0,0 +1,2326 @@
+ +/*************************************************************************
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -7093,9 +7093,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -8729,9 +8729,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -8951,9 +8951,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
+@@ -9045,9 +9045,9 @@
+ + *
+ + *  $RCSfile: nativewidgets-vcl.diff,v $
+ + *
+-+ *  $Revision: 1.7 $
+++ *  $Revision: 1.8 $
+ + *
+-+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
+++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
+ + *
+ + *  The Contents of this file are made available subject to the terms of
+ + *  either of the following licenses
diff --git a/app-office/openoffice-ximian/files/1.1.2/nativefix.patch b/app-office/openoffice-ximian/files/1.1.2/nativefix.patch
deleted file mode 100644
index 445983f56607..000000000000
--- a/app-office/openoffice-ximian/files/1.1.2/nativefix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- nativewidgets-vcl.diff
-+++ nativewidgets-vcl.diff
-@@ -3924,9 +3924,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4021,9 +4021,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4399,9 +4399,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4667,9 +4667,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4758,14 +4758,14 @@
- unchanged:
- --- /dev/null	2003-09-23 19:59:22.000000000 +0200
- +++ vcl/unx/source/gdi/salnativewidgets-gtk.cxx	2004-03-03 15:32:34.000000000 +0100
--@@ -0,0 +1,2163 @@
-+@@ -0,0 +1,2326 @@
- +/*************************************************************************
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -7093,9 +7093,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -8729,9 +8729,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -8951,9 +8951,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -9045,9 +9045,9 @@
- + *
- + *  $RCSfile: nativefix.patch,v $
- + *
--+ *  $Revision: 1.1 $
-++ *  $Revision: 1.1 $
- + *
--+ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
-++ *  last change: $Author: suka $ $Date: 2004/07/15 08:36:11 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
index c98659ea5c9d..5f26223a3395 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.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.1.60.ebuild,v 1.4 2004/07/15 08:36:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.5 2004/07/15 08:45:42 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -237,7 +237,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
 
 	cd ${PATCHDIR}/patches/OOO_1_1/
-	epatch ${FILESDIR}/${OO_VER}/nativefix.patch
+	epatch ${FILESDIR}/${OO_VER}/nativefix.diff
 
 	#Still needed: The STLport patch
 	cd ${S}