diff options
author | Daniel Goller <morfic@gentoo.org> | 2004-06-27 04:53:47 +0000 |
---|---|---|
committer | Daniel Goller <morfic@gentoo.org> | 2004-06-27 04:53:47 +0000 |
commit | 7be24f13336aedc745e26a9c11c0bde3d7929506 (patch) | |
tree | 51df4d8856d697df0cc88141ea45bc67a70ee402 /app-cdr | |
parent | version bump (Manifest recommit) (diff) | |
download | gentoo-2-7be24f13336aedc745e26a9c11c0bde3d7929506.tar.gz gentoo-2-7be24f13336aedc745e26a9c11c0bde3d7929506.tar.bz2 gentoo-2-7be24f13336aedc745e26a9c11c0bde3d7929506.zip |
Added fix to allow compilation on gcc-3.4.0
Diffstat (limited to 'app-cdr')
-rw-r--r-- | app-cdr/arson/ChangeLog | 5 | ||||
-rw-r--r-- | app-cdr/arson/arson-0.9.8_beta2.ebuild | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/app-cdr/arson/ChangeLog b/app-cdr/arson/ChangeLog index 6a28f28ca500..815418246938 100644 --- a/app-cdr/arson/ChangeLog +++ b/app-cdr/arson/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-cdr/arson # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.29 2004/06/24 21:29:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.30 2004/06/27 04:53:47 morfic Exp $ + + 26 Jun 2004; Daniel Goller <morfic@gentoo.org> arson-0.9.8_beta2.ebuild: + Added fix to allow compilation with gcc-3.4.0 06 Jun 2004; Daniel Black <dragonheart@gentoo.org> arson-0.9.8_beta2.ebuild: x86 keyword diff --git a/app-cdr/arson/arson-0.9.8_beta2.ebuild b/app-cdr/arson/arson-0.9.8_beta2.ebuild index 87d0b96842bc..9e2e99c1788e 100644 --- a/app-cdr/arson/arson-0.9.8_beta2.ebuild +++ b/app-cdr/arson/arson-0.9.8_beta2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.8_beta2.ebuild,v 1.3 2004/06/24 21:29:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.8_beta2.ebuild,v 1.4 2004/06/27 04:53:47 morfic Exp $ -inherit kde eutils +inherit kde eutils gcc need-kde 3 MY_P=${P/_/} @@ -48,6 +48,18 @@ DEPEND=">=media-sound/cdparanoia-3.9.8 KEYWORDS="x86 ~sparc ~amd64" S=${WORKDIR}/${PN} +#added base_src_unpack() with conditional fix of code allowing compilation with gcc-3.4.0 +base_src_unpack() { + unpack ${A} + cd ${S}/src/ + + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] + then + einfo "Compiler used: gcc-3.4.x Applying patch conditionally." + sed -i "s:(font()):(font):" wizard.cpp + fi + cd ${S} +} src_compile() { use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis" |