Add patch for gcc-4.7. Bug #422665

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

4 files changed, 48 insertions, 25 deletions

diff --git a/media-sound/musique/ChangeLog b/media-sound/musique/ChangeLog
index 6a86391bb1eb..bb76d25e08e8 100644
--- a/media-sound/musique/ChangeLog
+++ b/media-sound/musique/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/musique
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.4 2012/02/09 23:19:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.5 2012/07/12 18:59:41 hwoarang Exp $
+
+  12 Jul 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/musique-1.1-gcc47.patch, musique-1.1.ebuild:
+  Add patch for gcc-4.7. Bug #422665
 
   09 Feb 2012; Markos Chandras <hwoarang@gentoo.org> musique-1.1.ebuild:
   add missing icon
@@ -20,4 +24,3 @@
   21 Jan 2012; Markos Chandras <hwoarang@gentoo.org> +musique-1.0.ebuild,
   +musique-9999.ebuild, +metadata.xml:
   Initial commit. This is just a package rename for media-sound/minitunes
-
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index 7d81edb81182..141ec78d1d1b 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST musique-1.0.tar.gz 766324 RMD160 c8dc95442d81d3972d4aba36b8f3155f63684dbb SHA1 79b0599b60c2a595113889ecd37ce2e688a8e686 SHA256 a3bbc377f4d73080a5fe0d4a348e03c56d6e5fb559a8e541af7407098cb94de3
-DIST musique-1.1.tar.gz 358081 RMD160 b0bac03ad549dc32d9a0b7bd4d05ce2933b32ab8 SHA1 a91cbb62c157a8bf46b272986f0c6f9040a4d9a1 SHA256 26bd8a65aa649a83fe772dc1f5c31c4f31bf32568c66f1b2c6ae1b5ff50b67c6
-EBUILD musique-1.0.ebuild 723 RMD160 9192a5ea1fa1a8c72559ba57a2f4a51c80221cea SHA1 3245ff01857b561ddcd784ca4836581e7089f9cf SHA256 2cbf530b4fbc6ba7b67af53dc05e7fcd25ec57c1752e2609f881797d2bccabb0
-EBUILD musique-1.1.ebuild 807 RMD160 09b6c2d90e9e1e01b82c85aa75918f53d60ed346 SHA1 7ea8d83a2970881b25887ceb6952ffb5bb3c70a1 SHA256 9389442e4fc7b794815278fb82c646fc42f749c62f7cc1c0004ca62cfd803634
-EBUILD musique-9999.ebuild 659 RMD160 112d8995931d6df7041711deae92b3f7def21ae8 SHA1 24ae8f8118632f29289bfcb4efdcf52b9e1cd363 SHA256 ad2db0c85ea0fbdbc0d5b862f4a7fd75895575544ea1ffe6f0887ffca565d24b
-MISC ChangeLog 807 RMD160 081e1fd06420191e9889b2bbfb3cc78f20843ed0 SHA1 6043f95a0991ff63ba8f51acdab9ce6572780f98 SHA256 b1b2e5cd172f35507ce08519902d78161f1f1d11317e61cc1832ec085a29a8bb
-MISC metadata.xml 298 RMD160 d5bc678c6fc9b36f63500704fd2e2c408607d2a4 SHA1 986dca1b0efeb229e084759f883463575cd640bd SHA256 6add982d7b67a78d0504f7ce036953a72ef5913c49a2c997515ed21fdb2ce1c1
+AUX musique-1.1-gcc47.patch 477 SHA256 45805c60c23a1158e92dfc1d50d9459c20919cf5b21d86f16eb72740e365a394 SHA512 68746442b5a8130bfb003af885c7a7d9d521d8be1a200610fedd0dba212336d48dd277cba340a3b902fcc8f9570116b4fc179c95e3abf5b9397d098f054bc3a0 WHIRLPOOL d2324aefb4fb0cc8722bae457094ca1f364a1ac50f8551f8a8f39713b17a1cbe82168d045cefb4e009f94cbf71238893edec99fb7b13f5c84d15398183b68276
+DIST musique-1.0.tar.gz 766324 SHA256 a3bbc377f4d73080a5fe0d4a348e03c56d6e5fb559a8e541af7407098cb94de3
+DIST musique-1.1.tar.gz 358081 SHA256 26bd8a65aa649a83fe772dc1f5c31c4f31bf32568c66f1b2c6ae1b5ff50b67c6 SHA512 f8958eafb4840e366b97d4dfd03ca49f766c41c193f8575ec7950f6b30dcb792ca5c22b48ca3366b930a54914f3f465d15e7127a8b4db4c1d1bf5a7e7c6264ac WHIRLPOOL 521118aa07deee618ab0f8b50c0c2adcb793059730b0650d554ebdcf7cd2e986003299b4aafa2b639d20b6df99c8e789becd1c437e48eb0462c992aa46fbde23
+EBUILD musique-1.0.ebuild 723 SHA256 2cbf530b4fbc6ba7b67af53dc05e7fcd25ec57c1752e2609f881797d2bccabb0 SHA512 206b0ded95828eeb0553bdb625d5c336fa51ea6b1d1a53fdb029234bcf783ee951cfbcbd9c30efa96c841b1d715fe3d44487757938a938fcc4dcce8b0a26fef1 WHIRLPOOL 19e4f6eb078e6c7188150c61b71aa9005e006574f837da1b57454dbf814aa0c0b22ce4a104126c2a9bd0b7ab4637605113f81128821f32d5b24ba0c18a434dc3
+EBUILD musique-1.1.ebuild 907 SHA256 afd08178a433bcc6959a90b2e28ac4829bb5cb119c5e0b8d8ac903caa969bcda SHA512 3612742f064c49fcd292923528c81bc26f1a9ee1d8f717a1cab1a1257a3a2ec96ed25539c6dd03422784dd8b24e2e62458829d8b5b112cbd0af8cae55f6efe5b WHIRLPOOL c52319c114477f83ae1b53e0000c5941ead5ca1d905df9ed25d4dc428a3cdb6185e496a03c706955d81a045d8f79611e52e705a133ac801104d045607ab0ab01
+EBUILD musique-9999.ebuild 659 SHA256 ad2db0c85ea0fbdbc0d5b862f4a7fd75895575544ea1ffe6f0887ffca565d24b SHA512 3f1d31b661cd65310e1041974dd538b8b53f4915841272ed3fa6be920259e90c0e4a5be41decdae6b3b43b49b5e37512edbe11e9842b4563636bfc65a33e7220 WHIRLPOOL bc6f094a4efc79578531d8f87e231a5e582d97f413ecd7029cb7c5d06e340d7b7ebaef0eb6d28bdaa032ed701aa9176ad3531a70e1656ecda414818067061cca
+MISC ChangeLog 951 SHA256 21a535b0615eac863ed792836a2af9977c14cd3a682cf22dc7ccdd2078baa3b7 SHA512 7743c0717aa74f61970efab71af1a609d64b22483785b58877b228a6d640281d278f3bfca9e2370b9353414b5e7638166386947972925490729caee6d9524a2d WHIRLPOOL 607660f809ad73691f7f9977ab6c6265a304286ce7be801b47194a96e7df8e81215960227ef77ecaf548400d893eafa0510fcc7be61809b15c8b5176eeb40989
+MISC metadata.xml 298 SHA256 6add982d7b67a78d0504f7ce036953a72ef5913c49a2c997515ed21fdb2ce1c1 SHA512 18158de0c27034217c099c855fe41a40d9e19087e04acc77f90a5a7942004f9ba83d817daf64cc301dfc8fa78106a3bea3eabe310cc4c325346271f24dffe4a6 WHIRLPOOL 56185c95c625d8bdb2614af286b965b5d3b09abd4869cc4fdd35560b98462388b97febbe1c984556c311485e846c3b0bad148ce4f50ae352058b30259218164c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPNFSIAAoJEPqDWhW0r/LCwCcP/1O7kZ9Wtyswt4tcWcUenkb2
-3NsX+YljkMVyY/DAlGKk6an/alWitQqlND40hqNuyEqquaK0Cz0XRq6/Oi9qTmLf
-liV2F//JEjrJcfBncYRf08ruGxbQZa7wr9xMni23mtlNNxZwp08d/u4QGPpjB9Qv
-KxHRXjVUYxdvU7YqlFJ3/HXXLXZ0kJUDQPB88SQi7ofj2mAj6y4Og6Z7fi8i3Qe3
-oCdq3tZ5v8lfMtl3OjlaMu4/YKpYBm81FcrsyZVkcdUfH2m6IWS2TFrwfbwDcsUV
-uIt0QbHI31pysCr98hSaAGLXJajdZkot3EursrSGNZMp/V1snzzwZWC2J9jg6PR7
-2gQTZqnFvN3NmGpNrn1Jpc7YqXAGal4fg/ZPRARp0qSL9Y9ufKMkeEjaJqgYxjZz
-DuO8BIjYv4tRmIo9ZWynG2lIdYxSl0nSzFBZ6UIHjTx+cEDslzz6G4uNFqkQlysI
-LEdYnXJoCYdtoGTE9Ng9SyQAiy1TqkWoGZLY4xV/FiODS5UoVTNks3PxmKAPwYHX
-Xr6QlxtzhN00Mdfb57RXNW/sbPSn7S/np3dNYGQS/xTHgS6+iaP53wE7BKZxklnC
-WklfDAAT/uEC3t8rNcNkWAMI8zCEBPW15zh4ssG9rtXH/O3AeJBeKgcRV0N4wUg3
-7Oq5nJjLC404hT8xJxEW
-=IT2u
+iQIcBAEBCgAGBQJP/x6iAAoJEPqDWhW0r/LCFl0QAKtCGvrdROLfHKWu58pwcz9R
+5lHFyEbBq2RiVlW3JCQtoQ2uH5k/Smbch2N0UXF5ciCFMAvRKGeMXs1FbT6ZuyR6
+3ALBakYmC5+i8n8almAK63vzIOY/EUMREBiZFqqJU46wUt9mEJhvdzb8VCmDKd3u
+SVbiCB/27dnTr9WUbviXpn3LcejwuG08YbjtbTtVuqROP7lFNZaf+LYuUESfGAT1
+PVysSsgX81nQx99Kc4SpgcDSKViF4wsqB1V6RfJh+G9L+h+o5t8LRxGHwRmac6V1
+uoVWaGgHy/dJgZfDvqXKqCml+6sEG5gzfe8QJ/dQ4UWmPg85xmTeooifvFYfSnQs
+e9WDSx8J9qjC4KULzQsFrbCp2Hsc9GZgUYyNCtHPn8auDXOkUR4VvutsLN5qDft5
+Gly5vtgbLJ9hln2oPYlAt5kiWCf8/asffQ0Rj0WDCE4GjAdXSQuR00eaVv1oDmhI
+FF4t2/N679VVs/Te210SORWejnvzdg9yuoEj6ZA0wH7PBb/io4o4HhlctG8pEFw3
+Pm/igs69y/5UkvCcJiBpumOqPfqz/t5xdj+5zWOjCtMIEIOBUreR97i8QS0Z/rNw
+h4hH/03VxwAzUy2+LRICwsZAByh5pbb7LijyyOPfErOUQOE+L0JP+4CaDyksniWW
+/FwHa/+epQENqd18yUUL
+=JHKv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/musique/files/musique-1.1-gcc47.patch b/media-sound/musique/files/musique-1.1-gcc47.patch
new file mode 100644
index 000000000000..6350578103bb
--- /dev/null
+++ b/media-sound/musique/files/musique-1.1-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=422665
+Index: musique/src/qtsingleapplication/qtlocalpeer.cpp
+===================================================================
+--- musique.orig/src/qtsingleapplication/qtlocalpeer.cpp
++++ musique/src/qtsingleapplication/qtlocalpeer.cpp
+@@ -57,6 +57,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI
+ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
++#include <unistd.h>
+ #include <time.h>
+ #endif
+ 
diff --git a/media-sound/musique/musique-1.1.ebuild b/media-sound/musique/musique-1.1.ebuild
index 2f226b72047c..12887d3b4fc3 100644
--- a/media-sound/musique/musique-1.1.ebuild
+++ b/media-sound/musique/musique-1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.1.ebuild,v 1.2 2012/02/09 23:19:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.1.ebuild,v 1.3 2012/07/12 18:59:41 hwoarang Exp $
 
 EAPI="4"
 
-inherit qt4-r2
+inherit eutils qt4-r2
 
 DESCRIPTION="Qt4 music player."
 HOMEPAGE="http://flavio.tordini.org/musique"
@@ -28,6 +28,12 @@ S="${WORKDIR}/${PN}"
 
 DOCS="CHANGES TODO"
 
+src_prepare () {
+	# bug 422665
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	qt4-r2_src_prepare
+}
+
 src_configure() {
 	eqmake4 ${PN}.pro PREFIX="/usr"
 }