diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-03-06 10:40:36 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-03-06 10:40:36 +0000 |
| commit | b1e18da7e5ef76467e01313db0030ac2d935c15d (patch) | |
| tree | 2fd9017262afac6e6c6b212894b04e3de0d71f4e | |
| parent | 'notransactions' removed for mail-filter/bogofilter (diff) | |
| download | gentoo-2-b1e18da7e5ef76467e01313db0030ac2d935c15d.tar.gz gentoo-2-b1e18da7e5ef76467e01313db0030ac2d935c15d.tar.bz2 gentoo-2-b1e18da7e5ef76467e01313db0030ac2d935c15d.zip | |
Fix build problems, bug #82385
(Portage version: 2.0.51.19)
4 files changed, 27 insertions, 5 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index cd0a2bbe31f0..0e81124448e7 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,12 @@ # 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.113 2005/03/04 20:58:01 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.114 2005/03/06 10:40:36 suka Exp $ + + 06 Mar 2005; Andreas Proschofsky <suka@gentoo.org> + files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch, + openoffice-ximian-1.3.8.ebuild: + Fix some build problem related to gcc-naming, closes bug #82385, also back + out evolution-data-server-support for the time being 04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-ximian-1.3.7.ebuild: diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch index 426e37e6678d..37eed77e51b5 100644 --- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch +++ b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch @@ -9,7 +9,7 @@ -GentooKDE : Gentoo, KDECommon +GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath +Gentoo : GentooBase -+GentooGNOME : GentooBase, GnomeVFS, Evo2, NovellOnly, GentooOnly ++GentooGNOME : GentooBase, GnomeVFS, NovellOnly, GentooOnly +GentooKDE : GentooBase, KDECommon # somewhat odder: diff --git a/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch new file mode 100644 index 000000000000..0fbeb07ee3d6 --- /dev/null +++ b/app-office/openoffice-ximian/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-ximian/openoffice-ximian-1.3.8.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild index e013b5bccad8..af36830b78c6 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.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.8.ebuild,v 1.8 2005/02/18 03:12:51 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.9 2005/03/06 10:40:36 suka Exp $ # Notes: # @@ -59,8 +59,7 @@ RDEPEND="!app-office/openoffice-ximian-bin >=dev-lang/perl-5.0 gnome? ( >=x11-libs/gtk+-2.0 >=gnome-base/gnome-vfs-2.0 - >=dev-libs/libxml2-2.0 - >=gnome-extra/evolution-data-server-1.0 ) + >=dev-libs/libxml2-2.0 ) kde? ( kde-base/kdelibs ) >=media-libs/libart_lgpl-2.3.13 >=x11-libs/startup-notification-0.5 @@ -265,6 +264,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 |