Build fix for stlport on ppc

Package-Manager: portage-2.0.53_rc5

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 333f892e1689d2c6fa6f068e4863c5476808339f..8a6c0947b47ed314e53f4f385713bbd586824c3b 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.133 2005/10/18 05:11:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.134 2005/10/18 06:45:16 suka Exp $
+
+  18 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc3.diff, openoffice-2.0.0_rc3.ebuild:
+  Build fix for stlport on ppc
 
 *openoffice-2.0.0_rc3 (18 Oct 2005)
 

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 32ed64345db9b6c654fd40f6c512922027e202c4..fa86d40d2eb4c2debdc733a83d1dbe63656ac822 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 67f5ebeb31064457c526f13231a34775 ChangeLog 29314
+MD5 23f09c15e39f99f4c514eaedae970677 ChangeLog 29465
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -33,7 +33,7 @@ MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 4821a498748cc2b42dd3d32b27c95da9 files/2.0.0/config_office-openldap-fix.diff 484
 MD5 9fcafd818f3e84a8adda72501784243e files/2.0.0/gentoo-2.0.0_rc2.diff 1105
-MD5 f0bcf1ad55fa79fd9be29bc667e80cc2 files/2.0.0/gentoo-2.0.0_rc3.diff 890
+MD5 39239f7e09e3fdd536498728404bfbef files/2.0.0/gentoo-2.0.0_rc3.diff 957
 MD5 078172057d5be938e24273c359b42435 files/2.0.0/no-ldap-mozilla.diff 1292
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
@@ -43,4 +43,4 @@ MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
 MD5 69cc79438c5fd1c142f647e49769815b openoffice-2.0.0_rc2.ebuild 7083
-MD5 294254e68e84a7a13b6d77b820278640 openoffice-2.0.0_rc3.ebuild 6945
+MD5 94c7530a7b2b51223c1087fdf108db76 openoffice-2.0.0_rc3.ebuild 7083

diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff
index 1b55c293a47ba18d29fdb411557c09e4d86e020b..009dc5eb186a1176909d43fe158a0031572a3490 100644 (file)
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff
@@ -1,6 +1,6 @@
 --- patches/OOO_2_0/apply 
 +++ patches/OOO_2_0/apply
-@@ -741,7 +741,10 @@
+@@ -741,7 +741,12 @@
  gentoo-splash.diff
  # Do not use mozilla-ldap, it breaks for us
  no-ldap-mozilla.diff
@@ -9,6 +9,8 @@
 +no-fontooo-wizard.diff
 +# Fix the system default fpicker
 +default-system-fpicker.diff
++# Fix for build breakage on PPC
++stlport-vector-ppc-buildfix.diff
  #
  # NOTE: 64 bit OOo is work in progress!
  #

diff --git a/app-office/openoffice/openoffice-2.0.0_rc3.ebuild b/app-office/openoffice/openoffice-2.0.0_rc3.ebuild
index e181d987c70e7ee6fba836572a822752cb299a72..6b48449b38dcc33b039e8c8adb0fe706ed5ef88e 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0_rc3.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0_rc3.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/openoffice-2.0.0_rc3.ebuild,v 1.1 2005/10/18 05:11:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc3.ebuild,v 1.2 2005/10/18 06:45:16 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -122,6 +122,9 @@ src_unpack() {
        cd ${PATCHDIR}
        epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.diff
 
+       #Additional and new patches get here
+       cp -pPRf ${FILESDIR}/${OO_VER}/stlport-vector-ppc-buildfix.diff ${PATCHDIR}/patches/src680 || die
+
        #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
        use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"