Added patch from bug 65883.

4 files changed, 64 insertions, 23 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 36e03427aa38..71a7afc8738e 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.85 2005/01/01 15:39:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.86 2005/01/07 23:41:08 hansmi Exp $
+
+  08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.1.3/STLport-vector.patch, openoffice-ximian-1.3.6.ebuild:
+  Added patch from bug 65883.
 
   18 Nov 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.3.6.ebuild:
   Added to ~ppc.
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index ec6f1ac1f969..f3f1bfe3cf27 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,32 +1,33 @@
-MD5 aa77e8c621a9a5e8a47d41cd0d0528b3 ChangeLog 21279
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 61b13ede9aa439c4a48998506293c7f0 openoffice-ximian-1.1.55.ebuild 15004
-MD5 a0ec9efec8dc558523842dd1cb18362f openoffice-ximian-1.3.6.ebuild 16803
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 d21849e289c64d4eb941b069ce0804ce ChangeLog 21429
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
+MD5 418737cfa50eea44ef0ac8886509bee5 openoffice-ximian-1.3.6.ebuild 16874
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
-MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
+MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215
+MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
+MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980
+MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
+MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
+MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
+MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
+MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
+MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
-MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
+MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
 MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
 MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
-MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
-MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
-MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
+MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221
+MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298
-MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
-MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
-MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
-MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
+MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
diff --git a/app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch b/app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch
new file mode 100644
index 000000000000..1892f1cabeed
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch
@@ -0,0 +1,32 @@
+--- stlport/STLport-4.6.2.patch	2005-01-06 12:26:48.770546592 +1100
++++ stlport/STLport-4.6.2.patch	2005-01-06 12:26:01.125789696 +1100
+@@ -69,3 +69,29 @@
+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
+  
+  install_unix :
++--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
+++++ misc/build/STLport-4.6.2/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
++@@ -46,8 +46,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++ 
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
++ 
++ include common_percent_rules.mak
++ include common_rules.mak
++--- misc/build/STLport-4.6.2/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
+++++ misc/build/STLport-4.6.2/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
++@@ -44,8 +44,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++ 
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
++ 
++ include common_percent_rules.mak
++ include common_rules.mak
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild
index f276a3f4ee28..6b1ba313501e 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6.ebuild,v 1.5 2005/01/01 15:39:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild,v 1.6 2005/01/07 23:41:08 hansmi Exp $
 
 # Notes:
 #
@@ -241,6 +241,10 @@ src_unpack() {
 	cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
 	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
 
+	if use ppc; then
+		epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch
+	fi
+
 	#Add our own splash screen
 	epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff