Fix building w/ GCC 4.4 for bug #264464.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 100 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index acf5811b0fa9..efb64863eec2 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.314 2009/04/14 03:29:43 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.315 2009/04/15 00:47:45 dirtyepic Exp $
+
+  15 Apr 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/amarok-1.4.10-gcc44.patch, amarok-1.4.10_p20090130-r1.ebuild:
+  Fix building w/ GCC 4.4 for bug #264464.
 
 *amarok-2.0.2-r1 (14 Apr 2009)
 
diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
index d4439e140fc2..94a3bb1e892c 100644
--- a/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.10_p20090130-r1.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/amarok/amarok-1.4.10_p20090130-r1.ebuild,v 1.2 2009/04/14 03:05:15 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild,v 1.3 2009/04/15 00:47:45 dirtyepic Exp $
 
 ARTS_REQUIRED="never"
 
@@ -77,6 +77,7 @@ RDEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/amarok-1.4.9.1-libmtp-0.3.0-API.patch"
 	"${FILESDIR}/amarok-1.4.10-gcc-4.3.patch"
+	"${FILESDIR}/amarok-1.4.10-gcc44.patch"
 	"${WORKDIR}/amarok-1.4.10-post20090130.diff"
 	"${WORKDIR}/amarok-1.4.10-desktop-entry.diff" )
 
diff --git a/media-sound/amarok/files/amarok-1.4.10-gcc44.patch b/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
new file mode 100644
index 000000000000..632e9fa3bdee
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
@@ -0,0 +1,93 @@
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-03-31 22:12:29.000000000 -0600
+@@ -31,6 +31,8 @@
+ 
+ #include <netinet/in.h> // ntohl
+ 
++#include <stdio.h>
++
+ using namespace TagLib;
+ 
+ 
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:08:16.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:11:57.000000000 -0600
+@@ -30,6 +30,7 @@
+ #include <netinet/in.h> // ntohl
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+ 
+ using namespace TagLib;
+ 
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-03-31 22:13:06.000000000 -0600
+@@ -29,6 +29,8 @@
+ #include <taglib/tfile.h>
+ #include <taglib/audioproperties.h>
+ 
++#include <stdio.h>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-03-31 22:16:01.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include "taglib_audiblefile.h"
+ 
+ #include <string.h>
++#include <stdio.h>
+ 
+ TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-03-31 22:18:22.000000000 -0600
+@@ -29,6 +29,8 @@
+ #include <taglib/audioproperties.h>
+ #include <taglib/tag.h>
+ 
++#include <stdio.h>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-03-31 22:18:06.000000000 -0600
+@@ -31,6 +31,8 @@
+ 
+ #include <netinet/in.h> // ntohl
+ 
++#include <stdio.h>
++
+ using namespace TagLib;
+ 
+ struct WavHeader
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-03-31 22:19:55.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include "wavfile.h"
+ 
+ #include <string.h>
++#include <stdio.h>
+ 
+ TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+diff -Naur amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp amarok-1.4.10/amarok/src/metabundlesaver.cpp
+--- amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp	2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-03-31 22:30:30.000000000 -0600
+@@ -6,7 +6,7 @@
+ 
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <stdio.h>
++#include <cstdio>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <sys/types.h>