Add upstream patch to fix build with gcc47 spotted by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #414147.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 32 insertions, 19 deletions

diff --git a/media-sound/audex/ChangeLog b/media-sound/audex/ChangeLog
index 132ce96db25e..a5c4ba3a57a3 100644
--- a/media-sound/audex/ChangeLog
+++ b/media-sound/audex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audex
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.13 2011/10/28 23:48:43 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.14 2012/05/02 17:59:13 johu Exp $
+
+  02 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/audex-0.74_beta1-gcc47.patch, audex-0.74_beta1.ebuild:
+  Add upstream patch to fix build with gcc47 spotted by Michael (kensington)
+  <gentoo@scribeofthenile.com> wrt bug #414147.
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> audex-0.74_beta1.ebuild:
   Bump to EAPI=4
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 15bc3b9fc97e..c89d9743ae99 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX audex-0.74_beta1-gcc47.patch 268 RMD160 b06143871f8fac2fa0e3774fd82d279f3a28bce7 SHA1 62a6b1e29a58bae7c2b7726b544257ffe878f17b SHA256 505916cb43b8639d3bd6fdd99ed53754db05d765cabbad0985fffd778a7a09c4
 DIST audex-0.74b1.tar.xz 269112 RMD160 0189a1b6d68c3f6d9509b67882415b34c422cb52 SHA1 0c446994f106d4da5da275fb2c4fbef82a25d95c SHA256 47e39dbf0fcd600314aa975c5a57f3a2970c4eb9214a8ddccef828598d9c5da5
-EBUILD audex-0.74_beta1.ebuild 738 RMD160 195fa068b3342b8da54a056a2fbf581528f83c4b SHA1 ae0daf208407dbacb6da9954c78a69612ffbf29c SHA256 158ff42ecc5fe1689e22a8a62151846d52f3315ba1da04b3ea3444a1d0a1278e
-MISC ChangeLog 2388 RMD160 ea020d58abbb6375cc02dfa4d427b98eb561202a SHA1 bb3e79bd73931da1dae9cfd86354e0b5b097e46e SHA256 a28328dc65c3f05a266d7902ea2df6000de5ccda8f28903843b0f92ed41b8f60
+EBUILD audex-0.74_beta1.ebuild 782 RMD160 64c7bbcd9513caeea1e7d141becd14f83cd4eb14 SHA1 9bb809a4244ce7429499053caf06714ef1b12a36 SHA256 44371f4df26829cbb8c6ccc67ecf8c3e4583ea2a191aeb0ccd77c1d6f1143490
+MISC ChangeLog 2626 RMD160 11f612787b4a39b39c108b7a03f425c0c34b7bd6 SHA1 d4f4429b59d57087ea52d78dd9d057bec2e16435 SHA256 9b011484f0b50afc5bc4c7f0817fa507b60cd1f52f1ea09fb9d399fd3c1eb5c7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOqz9gAAoJELHSF2kinlg4BWsQAI6ZLiqUuei2ulNQddc1hLTz
-vYeDuvRXaN5hJIhpkjrfJuTARTjou88Qi5yYnZxfPNGQp9hch3OXypGbEVFAzSSm
-Age6kbp423Z0ZADrxmnelIEUkjkGaO71riY/+gHz95Q2GtT0NwYEcTxn4KfxBBVX
-57A9TwdCr5OE8+L7a2pMISO2CzTcJKl0c9cX1PYTwq+t+zO3sWHyn/ec94V3IF7z
-dqEoHsYWcbPigoDvyuMRtIVrhVaGecmUW+2yirGfYh5j/aI5V+KT8Vot/ZJacdcQ
-Qcv+NuxTzL51XTnH3kK6kZ21/Zurv+NojGEjA0qaGMu/MH/6I0xWgH5I6KfY9eTu
-CqSBVWHoSI1CghNF7Um32CWZeycTCDiRI9JoGBWm5Ft+hErgRoX8tnBCatNg+oTp
-C1iAAGFJapZFi0IdK4Y8MU5OKV1n7bjyWqbAQT3B4trzaLa9sMJFPg3ZVwM8sxEY
-xgw5DthaYHLTEjGgbnjg3YBOuSYRZWPmi8dMlnbzwjsT4NI/2TmzRU+CEXMeaaPI
-nQR82nTJ2534n3B0zA17PuvmEsgUFrGtzWI2xyGfjeFti8AKvV+8rYJz03mbiO6S
-SeMTTcpWlLkwts2BDvgVA+4b8O5U3ygyH3Oqh0VgSbdXlkRKVda0Kk++6YluAOF1
-r2ceHq2m+T/LDu8OH3t0
-=hASR
+iQEcBAEBCgAGBQJPoXZAAAoJEO+t9ga+3I3a5bcH/iNRcLRbBB5QfTBWC4yQt0h+
+j5yZsyDa4QFg02pWb9Y75n42pNHdyTFtUInZPFWaWKljkS7rsO7xYGzJZJ3k0IYr
+hZxSTU5Ni+BDfHvQJ/nSRHF/hdO1qDi4n1nR0OFyRzvM8BOYOlX+bFTcFepRlnmb
+8CgxsAfHgFRKBHbx/9dVhqd5v4sxmfprz0wxkvHtAVv2p3+3Ye2NmNUAV3/L9Dqz
+Y8m5QXA8uij9hNoadfEqota4ULlE8JRUCiUUpFaQqhDLA6qRbOsvSoDchBDru5H2
+tvG3Z2lCoKWzNGXInhwrI4b23LXGZpBRjhy80dAmza2NFy3oS/35TrV8HeAsGAA=
+=VpJv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audex/audex-0.74_beta1.ebuild b/media-sound/audex/audex-0.74_beta1.ebuild
index b144201fba02..067621390bf7 100644
--- a/media-sound/audex/audex-0.74_beta1.ebuild
+++ b/media-sound/audex/audex-0.74_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.74_beta1.ebuild,v 1.2 2011/10/28 23:48:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.74_beta1.ebuild,v 1.3 2012/05/02 17:59:13 johu Exp $
 
 EAPI=4
 
@@ -26,3 +26,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
diff --git a/media-sound/audex/files/audex-0.74_beta1-gcc47.patch b/media-sound/audex/files/audex-0.74_beta1-gcc47.patch
new file mode 100644
index 000000000000..fb877a587281
--- /dev/null
+++ b/media-sound/audex/files/audex-0.74_beta1-gcc47.patch
@@ -0,0 +1,11 @@
+--- trunk/playground/multimedia/audex/utils/hashlist.cpp	2012/03/23 23:49:44	1286829
++++ trunk/playground/multimedia/audex/utils/hashlist.cpp	2012/03/23 23:51:20	1286830
+@@ -18,6 +18,8 @@
+  
+ #include "hashlist.h"
+ 
++#include <unistd.h>
++
+ Hashlist::Hashlist() {
+ 
+ }