Fix building w/ GCC 4.4 for bug #264464.

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

4 files changed, 113 insertions, 4 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/Manifest b/media-sound/amarok/Manifest
index 964235e5e223..f5413c568abf 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0.1.1-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61
 AUX amarok-1.4.10-audibletag.patch 2412 RMD160 9c37b2861c17a3ff9c5a447338cbbc735fcfd634 SHA1 25ebc67a0f6254c1fae9a96b967f700a5ea81746 SHA256 724f2411cc9a6d4cc972fe6b3d40bdf1d4075347eca3460bdaf0b35980f838a3
 AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
+AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
 AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 SHA1 bf38186111297dc9da5eb00be14ba9772d2ae134 SHA256 5c65d14d2aa8b6739a7a8493f7d4db808c25d56047ff00b7adcd8754ee97e4f2
 AUX amarok-1.4.7-svn148317.patch 538 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 SHA1 f66e14a0273e68caf9ceb40b8475d35c32bc04e5 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae
 AUX amarok-1.4.9.1-helix+gcc-4.3.patch 435 RMD160 2ebf5155e052d90e027d207820bd4328b75014ea SHA1 af9169a7dd9df1598099acea2e84310d1ec9b1bb SHA256 b35b0c42d19d48fda2385962aeaa132b2cf659ddeebcadc5eae3f6dfe7e44894
@@ -12,8 +16,15 @@ DIST amarok-2.0.1.1.tar.bz2 5012905 RMD160 d7d159d5407231f787397b0bbc57623ebcc75
 DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651
 EBUILD amarok-1.4.10-r2.ebuild 3122 RMD160 090b3339a6af25c617c85edefb681f2944a4ec89 SHA1 6d71e3514e7ca64be208e60424be1f20a933b8c2 SHA256 58ffd9bb7d4cd623d1d8ea3bbe1c98f8dea6d29d661048f2a803f310af2cc932
 EBUILD amarok-1.4.10-r3.ebuild 3226 RMD160 38303bdfe9ad65d6861379e51bddfc598f719e60 SHA1 a2f550c116ef3ee20b62ff0b0ee579e04ea0a997 SHA256 61aad4673e25198ce540f657abf4eefce408fb510947626737622254794c048f
-EBUILD amarok-1.4.10_p20090130-r1.ebuild 3162 RMD160 eabc96bcd8afa372998649a41333af2601703656 SHA1 c6f4cbff0a8c5637ec5f4b692054a7bc57092d95 SHA256 1ab85e6ac5a66938045dfda98214d2f3c015725603bc0e12d7f1496bf43564ed
+EBUILD amarok-1.4.10_p20090130-r1.ebuild 3201 RMD160 63062644bac15b2263bce78e4762f6f2f7ad01fd SHA1 14d1af889019f55e92a8dbd655b403134c69bcd4 SHA256 fa9b2da0ee9a008fd4453b35895b4eb1021d372a20ea5a27cb37d486abb035e4
 EBUILD amarok-2.0.1.1.ebuild 2318 RMD160 b87f86fad0f1064629a4f9187e618a1215856598 SHA1 f93ebfd298b97597e81bb47c55ad50a9d633abe6 SHA256 9f5497169f33b796d9d40d570a58a426354f11aea52bf496341df94283736296
 EBUILD amarok-2.0.2-r1.ebuild 2355 RMD160 5d1e4f4728fab7cb9a75ba48a0caa2e91e6e090e SHA1 46a90df80898393457ddfc7558a4e46d4bca039a SHA256 42aac557e95e4307d6b60fd30c0a0e2c9fdbb05a8a77035196b1c301a0305bba
-MISC ChangeLog 50974 RMD160 f4ec6c513cfd1c9afbc3ebd2a03c3e98501405d9 SHA1 00db8089d1fb65866ac3dedeadd3274089bc546f SHA256 f085b3e2d5c5683685eb80522d8d85f76c62d2247884bc23c06d373d4450ba9d
+MISC ChangeLog 51135 RMD160 c53e8ffc0198a8a659d0b3f05c4ffe9b462f8cf9 SHA1 b3dbd22b6f15f47d6fef0ec30731bfc1bd04813e SHA256 a9150f0423ef66c029d7e914614c889629471a007c39899707948016755ec9b6
 MISC metadata.xml 2198 RMD160 20512dd449b537ffd44a2e052359f0939be4df96 SHA1 feee1598c24a41fa4296f37f1e41b3154b8dc7e4 SHA256 c6e222bf1223b29d298a3f988701376515912c9938b53f284839bc432f49066b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknlLy4ACgkQiqiDRvmkBmLzeACfVfG0iyb6ldCSCDf2FaHGl72m
+jBEAoMmC9yN6flVig8y82+rLRFsVpQ6y
+=I9HH
+-----END PGP SIGNATURE-----
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>