Fix compilation with gcc-4.7. Bug #423221

Package-Manager: portage-2.1.11/cvs/Linux x86_64

4 files changed, 75 insertions, 8 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index f83f02eed14f..d4049242c179 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.67 2012/04/25 15:20:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.68 2012/06/26 18:24:07 hwoarang Exp $
+
+  26 Jun 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lastfmplayer-1.5.4.27091-gcc47.patch,
+  lastfmplayer-1.5.4.27091-r2.ebuild:
+  Fix compilation with gcc-4.7. Bug #423221
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org>
   lastfmplayer-1.5.4.27091-r2.ebuild,
@@ -344,4 +349,3 @@
   02 Apr 2006; Stefan Schweizer <genstef@gentoo.org> +metadata.xml,
   +lastfmplayer-1.1.4_p2099.ebuild:
   New ebuild thanks to David Li <matrixhax0r@yahoo.com> in bug 102059
-
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index 669b877e8825..04177b7a237e 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -2,19 +2,30 @@
 Hash: SHA512
 
 AUX fix_plugin_path.patch 540 RMD160 bcfe86a5c193824ee4605bc3989905fa2745d1f8 SHA1 768a15ed2600d0050b6577e1dec0af69663132ed SHA256 e4a44bad4bf286eb2ecbece48df873a3e8b29afcef7cc5b0c624936c1e459fab
+AUX lastfmplayer-1.5.4.27091-gcc47.patch 1059 RMD160 45aa716d678afe3a6584c8c21a2dc8cb389465a7 SHA1 3f173377b96a646e7218ce884dec39ca769b1ba1 SHA256 718bd0c5ec07b353e29647f203f0e55252039e1601b31257409e834a9d0797c1
 AUX lastfmplayer-1.5.4.27091-glib.h.patch 461 RMD160 18b4ee55618cd87cc62ec2f632351b0716d2fa32 SHA1 4b38f9357f7513b996a8fb6ef07e00a84bd09b36 SHA256 c2371dc7d74bc9cf07d9663df52bb4142c7e8dd6dad9366856c97526c0649c34
 AUX lastfmplayer-extensions-path.patch 1507 RMD160 8489ee04a47a1263996e92b8ee2220e83ae32445 SHA1 3bc79e72796730ea8294032ecd2ba6c6325aa161 SHA256 4ec6beecbe5de40937b148ac72bc7d52a81f7636c8ef11b1a821db6488578153
 DIST dbusextension-2.0.tar.bz2 11101 RMD160 729afa5944c157cf4ff44dbb947fb5fab1eaf2d1 SHA1 7b43f450dfd6923afb1c58d89c829ca92ad02158 SHA256 db9f5040b593886a36ec409bb1e5b96f2225132207c841cc0b3c15c6242741d2
 DIST lastfm-1.5.4.27091+dfsg.tar.gz 1480448 RMD160 db34c471d8500ffde7bda71db4daf988372828d6 SHA1 3084e06d3a1e992204f7ea26e5a335722acad081 SHA256 b26596f35e71c9f5b20505486cb73f34404bbef01949c166929f566a5d9d6505
 DIST lastfm_1.5.4.27091+dfsg-2.debian.tar.gz 69004 RMD160 6145207d64e85d8b949c44022e17b8f66a0ba9e8 SHA1 bca8826e627b2bdada28619acf00931cbaea16ff SHA256 e5953574db35c098b0d82537d69c0e15369bd3d3a84920a7ae42948ce9d42db7
 EBUILD lastfmplayer-1.5.4.27091-r1.ebuild 4340 RMD160 1632634e2c30bd1d3e2b5b5f56df41ade0869d0d SHA1 4659385ed3bdda5e9531a77de23032b65aefa8d0 SHA256 7c20ba3f085c96102a58c16dfcba18afa0f1a163049587b8b248f8dd8120c0c7
-EBUILD lastfmplayer-1.5.4.27091-r2.ebuild 4587 RMD160 fcb47f9e4f182914ac4a992a74d69c1c444c93a0 SHA1 e4fac5f34ad045f8273bcdc244fbf75a9be9ab61 SHA256 ba23d85fa9519414eb754966f7add20e7f44e54912c9f3791f60615020060b52
-MISC ChangeLog 12833 RMD160 1e3158dce5cab8ae2b3ee8aa20a6c9ab3853f367 SHA1 3718f99133153d662d191ddb037c5959a999530d SHA256 92759d1fb3f20e4e902b1e2a58c82d0d04d0893b014a32099e61bc57230e2bdd
+EBUILD lastfmplayer-1.5.4.27091-r2.ebuild 4666 RMD160 25540605ec6908a722e2b7887c3411d45b2e82f4 SHA1 935f3b81a8f3c629f43b40cd9bf38023b32ccad1 SHA256 90a97328014ff70eccf5ecdd8a2d95f7dcd0e0790ebfac243946111a3a363060
+MISC ChangeLog 13019 RMD160 5bb34d7282c7549c7506a68879a55cc3c6132a7e SHA1 33b9bae7a527c8efbb42c4cd409c61be35405770 SHA256 56f4300b3949609f0976c874a9f34e59884b76ac676f3e5e2492b25281da329f
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+YFk0ACgkQgAnW8HDreRbNHgCdGv8dOYpFQyeFlRjavv17U/Uc
-7e4AoKCG+FWjp2nOo0yR+JCAbDfefkOS
-=N1pt
+iQIcBAEBCgAGBQJP6f5LAAoJEPqDWhW0r/LCHYgP/js7yag910FdwvjM4QlroXQE
+x25VY8L5tszLoZYdKJfJMcS/fC/+UkDY2/OKlqzOgVVqv2hfPRMfbetN9Tey6wQ+
+VetzqxUzNBWXU84zx5iGXsQyjxE1Q3jlBI5aEt4gkcRg5FuwxN3W4B42ZBNZdiv+
+4ISHYlHL+CVt0f0pFzhVyOHnAb7kpysmJY9JF7/q32yjOX6aaXc6yb2aD8/OI290
+jzhgdgOe2O2ErBd1Jzrlr1u092d1eB259RA9TFtAvDYMzUPP6NYz1bBQs4rShQ76
+fZm9TjsmhLu0aHyTx0s6Z8dGH3bxEESyswNbHKfjgQ4ILtP8fd7tZ94412zxWKV8
+dVnTN/zC2WYfSm0BbGOSigRmaIOaT9HxN04WOqMTaZj5owU00+FSLuOULAFlUUMt
+74BTxabHzdy9X44/8ADY4ivNY1A4Ire6XgtUw+EW4k6FdCfiTegMx7Vqljxu7KVS
+EVz3iDu4z3tGOcGMVO7Jv69Ge/hwLvG0+kptyEo0do95JOJjJPJF+HbNaZP3E9Oo
+GUZTVCKEQ7UrxGjGQQrLzin+cllww7kHtyvyjYljAsK04efeFLPJsfQ0PVCEFE3c
+0CeGf6SgpmeYfIlcIzcXpAbmhoKLQpHAavte4nk7/dQr1Oww+DCPHbNiuHzZM52S
+prazHi/A7Amy63lcwaWc
+=jZjm
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch
new file mode 100644
index 000000000000..5a6009b21859
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch
@@ -0,0 +1,50 @@
+Description: Fix compilation with gcc 4.7
+Author: John Stamp <jstamp@users.sourceforge.net>
+http://bugs.debian.org/667236
+https://bugs.gentoo.org/show_bug.cgi?id=423221
+--- a/src/libUnicorn/UnicornCommon.cpp
++++ b/src/libUnicorn/UnicornCommon.cpp
+@@ -32,6 +32,8 @@
+ #ifdef WIN32
+     #include <windows.h>
+     #include <shlobj.h>
++#else
++    #include <unistd.h>
+ #endif
+ 
+ using namespace std;
+--- a/src/lastfmapplication.cpp
++++ b/src/lastfmapplication.cpp
+@@ -59,6 +59,8 @@
+ 
+ #ifdef WIN32
+     #include <windows.h>
++#else
++    #include <unistd.h>
+ #endif
+ 
+ #ifdef Q_WS_MAC
+--- a/src/libUnicorn/Settings.h
++++ b/src/libUnicorn/Settings.h
+@@ -105,7 +105,7 @@
+     public:
+         MyQSettings( const UserSettings* const s )
+         {
+-            beginGroup( s->username() );
++            this->beginGroup( s->username() );
+         }
+     };
+ 
+--- a/src/playerlistener.cpp
++++ b/src/playerlistener.cpp
+@@ -33,6 +33,10 @@
+ #include <iostream>

+ #include <algorithm>

+ 

++#ifdef Q_OS_UNIX

++    #include <unistd.h>

++#endif

++

+ using namespace std;

+ 

+ 

diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
index 49ae384b6635..638c3f084720 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild,v 1.2 2012/04/25 15:20:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild,v 1.3 2012/06/26 18:24:07 hwoarang Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs qt4-r2
@@ -56,6 +56,8 @@ src_prepare() {
 
 	# only glib.h can be included directly in >glib-2.32
 	epatch "${FILESDIR}"/${P}-glib.h.patch
+	# Gcc 4.7 definitions. Bug #423221
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {