diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-01-07 23:41:08 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-01-07 23:41:08 +0000 |
| commit | b3b83800be97a746776c4079c60a87db92a088dc (patch) | |
| tree | 14c8c1b913dbfdc239defe493a5ffba2f1039a0a /app-office/openoffice-ximian | |
| parent | Stable on IA64; bug #76862. (Manifest recommit) (diff) | |
| download | gentoo-2-b3b83800be97a746776c4079c60a87db92a088dc.tar.gz gentoo-2-b3b83800be97a746776c4079c60a87db92a088dc.tar.bz2 gentoo-2-b3b83800be97a746776c4079c60a87db92a088dc.zip | |
Added patch from bug 65883.
Diffstat (limited to 'app-office/openoffice-ximian')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch | 32 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild | 6 |
3 files changed, 42 insertions, 2 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/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 |