summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-06-28 13:27:01 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-06-28 13:27:01 +0000
commit9895db7b2ed6d4115eeee472eac69a8a8d1b07e1 (patch)
treee0edcd54dd01ef8fe6b8af8ba3c15b40ce060358 /media-sound
parentMarking xfce4-appfinder-4.6.1 ppc64 for bug 265587 (diff)
downloadgentoo-2-9895db7b2ed6d4115eeee472eac69a8a8d1b07e1.tar.gz
gentoo-2-9895db7b2ed6d4115eeee472eac69a8a8d1b07e1.tar.bz2
gentoo-2-9895db7b2ed6d4115eeee472eac69a8a8d1b07e1.zip
Fix build with gcc 4.4, bug #274168
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/qtractor/ChangeLog6
-rw-r--r--media-sound/qtractor/files/qtractor-0.4.2-gcc44.patch33
-rw-r--r--media-sound/qtractor/qtractor-0.4.2.ebuild6
3 files changed, 43 insertions, 2 deletions
diff --git a/media-sound/qtractor/ChangeLog b/media-sound/qtractor/ChangeLog
index 27a62079188c..a6b10d976d8b 100644
--- a/media-sound/qtractor/ChangeLog
+++ b/media-sound/qtractor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/qtractor
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.19 2009/06/17 05:56:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.20 2009/06/28 13:27:00 aballier Exp $
+
+ 28 Jun 2009; Alexis Ballier <aballier@gentoo.org> qtractor-0.4.2.ebuild,
+ +files/qtractor-0.4.2-gcc44.patch:
+ Fix build with gcc 4.4, bug #274168
*qtractor-0.4.2 (17 Jun 2009)
diff --git a/media-sound/qtractor/files/qtractor-0.4.2-gcc44.patch b/media-sound/qtractor/files/qtractor-0.4.2-gcc44.patch
new file mode 100644
index 000000000000..859e042c4bc8
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.4.2-gcc44.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/show_bug.cgi?id=274168
+Upstream status: mailed 28/06/2009
+
+Index: src/qtractorAudioVorbisFile.cpp
+===================================================================
+RCS file: /cvsroot/qtractor/qtractor/src/qtractorAudioVorbisFile.cpp,v
+retrieving revision 1.13
+diff -u -B -r1.13 qtractorAudioVorbisFile.cpp
+--- src/qtractorAudioVorbisFile.cpp 27 May 2009 10:54:33 -0000 1.13
++++ src/qtractorAudioVorbisFile.cpp 28 Jun 2009 13:01:47 -0000
+@@ -27,6 +27,7 @@
+ #endif
+
+ #include <stdlib.h>
++#include <cstdio>
+
+
+ //----------------------------------------------------------------------
+Index: src/qtractorInstrument.cpp
+===================================================================
+RCS file: /cvsroot/qtractor/qtractor/src/qtractorInstrument.cpp,v
+retrieving revision 1.10
+diff -u -B -r1.10 qtractorInstrument.cpp
+--- src/qtractorInstrument.cpp 14 Jun 2009 13:09:21 -0000 1.10
++++ src/qtractorInstrument.cpp 28 Jun 2009 13:01:47 -0000
+@@ -26,6 +26,7 @@
+ #include <QTextStream>
+ #include <QRegExp>
+ #include <QDate>
++#include <cstdlib>
+
+
+ //----------------------------------------------------------------------
diff --git a/media-sound/qtractor/qtractor-0.4.2.ebuild b/media-sound/qtractor/qtractor-0.4.2.ebuild
index 42a47e7244ac..100af687e326 100644
--- a/media-sound/qtractor/qtractor-0.4.2.ebuild
+++ b/media-sound/qtractor/qtractor-0.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.4.2.ebuild,v 1.1 2009/06/17 05:56:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.4.2.ebuild,v 1.2 2009/06/28 13:27:00 aballier Exp $
EAPI=2
@@ -30,6 +30,10 @@ RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui )
vorbis? ( media-libs/libvorbis )"
DEPEND="${RDEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-gcc44.patch"
+}
+
src_configure() {
econf \
$(use_enable mad libmad) \