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 | 44ef01f4e9350f6ff71619dd0bef9457c927d0c6 (patch) | |
| tree | c9130cc95f26ff98cbb613a292e191bd01fd3410 /app-cdr | |
| parent | version bump (diff) | |
| download | historical-44ef01f4e9350f6ff71619dd0bef9457c927d0c6.tar.gz historical-44ef01f4e9350f6ff71619dd0bef9457c927d0c6.tar.bz2 historical-44ef01f4e9350f6ff71619dd0bef9457c927d0c6.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/Manifest | 4 | ||||
| -rw-r--r-- | app-cdr/arson/arson-0.9.8_beta2.ebuild | 16 |
3 files changed, 20 insertions, 5 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/Manifest b/app-cdr/arson/Manifest index d22cabb5d3e0..0b335accbbcb 100644 --- a/app-cdr/arson/Manifest +++ b/app-cdr/arson/Manifest @@ -1,8 +1,8 @@ MD5 6788ad471c02eace6da353c7848bc6f4 arson-0.9.7-r1.ebuild 883 MD5 744a78f2e4c1bf961612f22379af8194 arson-0.9.7-r3.ebuild 1035 -MD5 19bb167882e62ccbbf1f794e728b9f45 ChangeLog 3081 +MD5 874fbaa34f5b4e4c59d393b8fef124e4 ChangeLog 3203 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 -MD5 ca839424c1f4757699a43eaaf4bc1eae arson-0.9.8_beta2.ebuild 1400 +MD5 b48d46a844dfb6a53d05ea8c0e283046 arson-0.9.8_beta2.ebuild 1741 MD5 9043ac80aa72f06250eaf3ac47e4f25a files/arson-0.9.7-gcc33-multiline-string-fix.patch 1681 MD5 d1a2f8143625c8d49b900ca77960bdd6 files/digest-arson-0.9.8_beta2 69 MD5 36dfe8c597aa471beb98dc30e3606d47 files/arson-0.9.7-write-img-fix.diff 1689 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" |