Fix build with gcc 4.4, bug #274168

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 50 insertions, 8 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/Manifest b/media-sound/qtractor/Manifest
index 47b662de9d42..5ccc1b489292 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX qtractor-0.4.2-gcc44.patch 1142 RMD160 562e6721cca3909b51ca6c8480e3268317499990 SHA1 ff87277c98bfc1bf48ebc9a6a06d88cdaf04019a SHA256 62f850ac466fccb1a02e65100c1b046e7123c6100105b419a1933d5222e6bcdb
 DIST qtractor-0.4.2.tar.gz 642330 RMD160 ffe4194b394a827e6a54b6de25a11892a8f997f0 SHA1 f9205035bc12af3c8183aeac7e00348e41678451 SHA256 762c486e3d033999999b0fe99fc3967c1aff928b4e61dd045065b5a283c79c02
-EBUILD qtractor-0.4.2.ebuild 1399 RMD160 75a219e31f9431f583c8a1d19cd733ec2a8fb4fb SHA1 035c6dae81aa6eb387552b939b2565641a815164 SHA256 9c97578893f3da07a6f65ac1a9db5b355575e3b9f4cfc898ae30b4f2fae7afed
-MISC ChangeLog 2939 RMD160 859e62c61bd6105a69932122a959764d5b802a63 SHA1 907996888bf1a1e9268740969ec8198c53eee4cf SHA256 5e60dc6126cb5343877a5c651530ab9ebeff83d8808e23b678f05f135d177ac3
+EBUILD qtractor-0.4.2.ebuild 1457 RMD160 21ad6ff928cd735ceb6e16dde8950d3757fbfb39 SHA1 a22114afe1ebe769fd52fa48dae664b453407fd6 SHA256 6c3428dba10683bc17ffcf6a8b1f30bc6848b2d491ddf73c94a8dc9d282cb404
+MISC ChangeLog 3090 RMD160 1cc0bcf8086a9edc50fbc798b9b87f2f209b3b14 SHA1 9c66ff07812dae3b669b181721e3c344b5bd1f66 SHA256 6dff239b262dd080c874eee8cea24acfcd8a48c1175be65a0dfe8752c0d01771
 MISC metadata.xml 374 RMD160 923d6a66f28c7644c218d7a9489a2da649781db0 SHA1 12c4943ae628c95a3734332e33f5399130cb6398 SHA256 7a5f1a60b6ea09ac7331596bb1da9c53bdd13400bbba3d9491f8fa726c78b22c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAko4hagACgkQvFcC4BYPU0o46gCggni3OyNRtXsCSHiuQ815Mp3K
-RakAnRx3HOJ4g623WCb8t+VeSWGylooj
-=TNaY
+iEYEARECAAYFAkpHb6wACgkQvFcC4BYPU0pHJgCgobyTIW1MnO0MFjBcVipHnYPQ
+H6QAnjsDiYicAIRhN5W8VtBIrskCkhVC
+=5EpP
 -----END PGP SIGNATURE-----
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) \