diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:37:55 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:37:55 +0000 |
| commit | c040f44d6525a4a6de24807b088b37e31d2a7ed0 (patch) | |
| tree | 8c2693c5deb9461389b5f0ece0b901e79469959b /app-office | |
| parent | add sed to DEPEND. (diff) | |
| download | gentoo-2-c040f44d6525a4a6de24807b088b37e31d2a7ed0.tar.gz gentoo-2-c040f44d6525a4a6de24807b088b37e31d2a7ed0.tar.bz2 gentoo-2-c040f44d6525a4a6de24807b088b37e31d2a7ed0.zip | |
Fix bug #82385 also in older versions
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office')
4 files changed, 28 insertions, 3 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 0e81124448e7..af580f63ffb4 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,11 @@ # 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.114 2005/03/06 10:40:36 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.115 2005/03/28 08:37:55 suka Exp $ + + 28 Mar 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.3/getcompver.awk.patch, openoffice-ximian-1.3.6.ebuild, + openoffice-ximian-1.3.7.ebuild: + Fix bug #82385 also in older versions 06 Mar 2005; Andreas Proschofsky <suka@gentoo.org> files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch, diff --git a/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch new file mode 100644 index 000000000000..0fbeb07ee3d6 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch @@ -0,0 +1,14 @@ +--- solenv/bin/getcompver.awk.orig 2005-02-22 00:24:46.976743123 +0100 ++++ solenv/bin/getcompver.awk 2005-02-22 00:34:16.624045985 +0100 +@@ -98,6 +98,11 @@ + CCversion = $0 + } + } ++/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ { ++ if ( compiler_matched == 0 ) { ++ CCversion = substr($0, 0, index($0, "-") - 1) ++ } ++} + END { + if ( num == "true" ) { + tokencount = split (CCversion,vertoken,".") 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 7fa7bdfd5df7..c6e7df2ff3d1 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.8 2005/01/29 12:21:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild,v 1.9 2005/03/28 08:37:55 suka Exp $ # Notes: # @@ -243,6 +243,9 @@ src_unpack() { cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch + # fix for bug #82385 + epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch + if use ppc; then epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch fi diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index 1d4e715194de..86aba8d71925 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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.7.ebuild,v 1.18 2005/03/04 20:58:01 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.19 2005/03/28 08:37:55 suka Exp $ # Notes: # @@ -262,6 +262,9 @@ src_unpack() { #Another java problem epatch ${FILESDIR}/${OO_VER}/javafix.patch + # fix for bug #82385 + epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch + # Workaround for bug #73940, may break debug use flag on ppc if use ppc; then epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch |