summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2005-01-07 02:56:37 +0000
committerJoseph Jezak <josejx@gentoo.org>2005-01-07 02:56:37 +0000
commit37eba2164cc31bada36d13c8831643c491831449 (patch)
tree2c715665d74808c87e8d47068fb7dd09b7e07962 /app-office
parentTrying to refix #76517 by adding in better X11 lib logic. Hopefully this works. (diff)
downloadhistorical-37eba2164cc31bada36d13c8831643c491831449.tar.gz
historical-37eba2164cc31bada36d13c8831643c491831449.tar.bz2
historical-37eba2164cc31bada36d13c8831643c491831449.zip
Added fix for compiling on ppc with gcc 3.4.3. Also marked ppc stable. Fixes bug #73940 and bug #71286.
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog8
-rw-r--r--app-office/openoffice/Manifest5
-rw-r--r--app-office/openoffice/files/1.1.4/STLport-vector.patch32
-rw-r--r--app-office/openoffice/openoffice-1.1.4.ebuild9
4 files changed, 49 insertions, 5 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index ed6329ab156c..18d051fa3bbf 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
# 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.95 2005/01/01 10:19:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.96 2005/01/07 02:56:37 josejx Exp $
+
+ 07 Jan 2005; Joseph Jezak <josejx@gentoo.org>
+ +files/1.1.4/STLport-vector.patch, openoffice-1.1.4.ebuild:
+ Added a workaround for compiling openoffice on ppc with gcc 3.4.3. This
+ might break the debug use flag, but I'm not entirely sure. This fixes bug
+ #73940. Also, marked ppc stable for bug #71268.
01 Jan 2005; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.4.ebuild:
Marked ~ppc. Still only compiles on ppc with gcc 3.4.1 (not 3.4.3).
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a99b1b54e78a..c4561d6ecbec 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,5 @@
-MD5 19252b4afc6c44a12aaa13b9c66a935c ChangeLog 21145
-MD5 31e3954505cc0de69ee4301114d8f626 openoffice-1.1.4.ebuild 15661
+MD5 93ec09940017af1fa284064d5abf3531 ChangeLog 21456
+MD5 d662c0c67f94f025481c5fea3b40b5b6 openoffice-1.1.4.ebuild 15793
MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
MD5 89a7a84cadb82d1962990e9cb8e58c1c openoffice-1.0.3-r2.ebuild 20533
MD5 db4fc1842f4f355e5c4c875ef6b61fdc openoffice-1.1.3.ebuild 15689
@@ -31,6 +31,7 @@ MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471
diff --git a/app-office/openoffice/files/1.1.4/STLport-vector.patch b/app-office/openoffice/files/1.1.4/STLport-vector.patch
new file mode 100644
index 000000000000..1892f1cabeed
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/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/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index b8675600ff75..052b4e272b02 100644
--- a/app-office/openoffice/openoffice-1.1.4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.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-1.1.4.ebuild,v 1.2 2005/01/01 10:19:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.3 2005/01/07 02:56:37 josejx Exp $
# Notes:
#
@@ -39,7 +39,7 @@ HOMEPAGE="http://www.openoffice.org/"
LICENSE="|| ( LGPL-2 SISSL-1.1 )"
SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ppc"
RDEPEND="!app-office/openoffice-bin
>=sys-libs/glibc-2.1
@@ -228,6 +228,11 @@ src_unpack() {
epatch ${FILESDIR}/${PV}/gcc-instlib.patch
+ # Workaround for bug #73940, may break debug use flag on ppc
+ if use ppc; then
+ epatch ${FILESDIR}/${PV}/STLport-vector.patch
+ fi
+
#Fix for newer Freetype
epatch ${FILESDIR}/${PV}/freetype-217.patch