summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-11-25 19:36:01 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-11-25 19:36:01 +0000
commit3e40210c22b9ec8154cd40d67c6fe740853a5cbc (patch)
tree7e49bd336a5ffc32d47bd70b192e544cc07b9c20 /media-sound
parentAdd ~alpha + ~ia64 keywords, bug 134270. (diff)
downloadgentoo-2-3e40210c22b9ec8154cd40d67c6fe740853a5cbc.tar.gz
gentoo-2-3e40210c22b9ec8154cd40d67c6fe740853a5cbc.tar.bz2
gentoo-2-3e40210c22b9ec8154cd40d67c6fe740853a5cbc.zip
Fix compile issues with qt-4.1
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/traverso/ChangeLog5
-rw-r--r--media-sound/traverso/traverso-0.30.1.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog
index 774e5a2d5dfd..8774496bd8f3 100644
--- a/media-sound/traverso/ChangeLog
+++ b/media-sound/traverso/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/traverso
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.1 2006/11/25 00:29:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.2 2006/11/25 19:36:01 aballier Exp $
+
+ 25 Nov 2006; Alexis Ballier <aballier@gentoo.org> traverso-0.30.1.ebuild:
+ Fix compile issues with qt-4.1
*traverso-0.30.1 (24 Nov 2006)
diff --git a/media-sound/traverso/traverso-0.30.1.ebuild b/media-sound/traverso/traverso-0.30.1.ebuild
index b81537f66b08..ca7f606db685 100644
--- a/media-sound/traverso/traverso-0.30.1.ebuild
+++ b/media-sound/traverso/traverso-0.30.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.30.1.ebuild,v 1.1 2006/11/25 00:29:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.30.1.ebuild,v 1.2 2006/11/25 19:36:01 aballier Exp $
inherit eutils qt4 toolchain-funcs
@@ -31,12 +31,15 @@ src_unpack() {
sed -ie "s:^\(\#define\ RESOURCES_DIR\) \(.*\):\1 \"/usr/share/traverso\":" src/config.h
sed -ie "s:^\(target.path\ =\) \(.*\):\1 /usr/bin:" src/traverso/traverso.pro
sed -ie "s:^\(DESTDIR_TARGET\ =\) \(.*\):\1 /usr/bin:" src/traverso/traverso.pro
+ # Removing forced cxxflags
+ sed -ie "s:^\(.*QMAKE_CXXFLAGS_RELEASE.*\):#\1:" src/base.pri
+ # adding our cxxflags
+ sed -ie "s:^\(.*release\ {.*\):\1\n QMAKE_CXXFLAGS_RELEASE\ =\ ${CXXFLAGS}:" src/base.pri
}
src_compile() {
QMAKE="/usr/bin/qmake"
- $QMAKE traverso.pro -after\
- "QMAKE_CXXFLAGS_RELEASE=\"${CXXFLAGS}\" QMAKE_STRIP=\"/usr/bin/true\"" || die "qmake failed"
+ $QMAKE traverso.pro -after "QMAKE_STRIP=\"/usr/bin/true\"" || die "qmake failed"
# No no, this is not a typo, LFLAGS is what they use as LDFLAGS...
emake CC=$(tc-getCC) CXX=$(tc-getCXX) LINK=$(tc-getCXX) LFLAGS="${LDFLAGS}" || die "emake failed"
}