diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:09:41 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:09:41 +0000 |
| commit | a798da50ed57a019dcaa2bb81b4cdc471a1aa666 (patch) | |
| tree | 915c589c3b29dc04b741315905d2f2df68855395 /app-office | |
| parent | longdesscription dutch (diff) | |
| download | gentoo-2-a798da50ed57a019dcaa2bb81b4cdc471a1aa666.tar.gz gentoo-2-a798da50ed57a019dcaa2bb81b4cdc471a1aa666.tar.bz2 gentoo-2-a798da50ed57a019dcaa2bb81b4cdc471a1aa666.zip | |
Build fix for recent gcc-versions, closes bug #84548
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/1.1.4/getcompver.awk.patch | 14 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 62c7a46034d4..4eba38f5f355 100644 --- 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.111 2005/03/04 20:54:27 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.112 2005/03/28 08:09:41 suka Exp $ + + 28 Mar 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.4/getcompver.awk.patch, openoffice-1.1.4.ebuild: + Build fix for recent gcc-versions, closes bug #84548 04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-1.1.4.ebuild: Stable on sparc diff --git a/app-office/openoffice/files/1.1.4/getcompver.awk.patch b/app-office/openoffice/files/1.1.4/getcompver.awk.patch new file mode 100644 index 000000000000..0fbeb07ee3d6 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/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/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild index 1a608d1b5699..a245fe9d0b01 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.17 2005/03/04 20:54:27 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.18 2005/03/28 08:09:41 suka Exp $ # Notes: # @@ -242,6 +242,9 @@ src_unpack() { #Another java problem epatch ${FILESDIR}/${PV}/javafix.patch + # fix for bug #84548 + epatch ${FILESDIR}/${PV}/getcompver.awk.patch + # Workaround for bug #73940, may break debug use flag on ppc if use ppc; then epatch ${FILESDIR}/${PV}/STLport-vector.patch |