Add patch to fix build with gcc 4.3 for musicbrainz3, by Ryan Hill <dirtyepic@gentoo.org>, bug #204152

Package-Manager: portage-2.1.4_rc14

4 files changed, 52 insertions, 14 deletions

diff --git a/media-libs/musicbrainz/ChangeLog b/media-libs/musicbrainz/ChangeLog
index 3461e33512da..794a4543b331 100644
--- a/media-libs/musicbrainz/ChangeLog
+++ b/media-libs/musicbrainz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/musicbrainz
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.74 2008/01/02 00:40:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.75 2008/01/03 12:10:49 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/musicbrainz-3.0.1-gcc-4.3-includes.patch, musicbrainz-3.0.1.ebuild:
+  Add patch to fix build with gcc 4.3 for musicbrainz3, by Ryan Hill
+  <dirtyepic@gentoo.org>, bug #204152
 
   02 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   +files/musicbrainz-2.1.5-gcc43-includes.patch, musicbrainz-2.1.5.ebuild:
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 8d9a7d84e99a..14c9edcc597e 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -5,6 +5,10 @@ AUX musicbrainz-2.1.5-gcc43-includes.patch 2003 RMD160 0742448ec2c3e196ed522baa7
 MD5 9455555d03e3bd15d488ffdb2287ffa7 files/musicbrainz-2.1.5-gcc43-includes.patch 2003
 RMD160 0742448ec2c3e196ed522baa754a57adb57cdcfb files/musicbrainz-2.1.5-gcc43-includes.patch 2003
 SHA256 b1213340c9472bcbf391b9f85db0327a2aa8e9ce789cc700e0a9cee2a83239ee files/musicbrainz-2.1.5-gcc43-includes.patch 2003
+AUX musicbrainz-3.0.1-gcc-4.3-includes.patch 898 RMD160 f28029c21b7a187858c096d229f321dae859ff4f SHA1 1cd7f2d22f5cdd5e62f1c978f944fa30f3f8bc49 SHA256 82ea5f358c62400339a6196adbed43c81edbb573885f79cb28e4498c2d720e51
+MD5 80d1c4e809f770752a3e2b16b79364be files/musicbrainz-3.0.1-gcc-4.3-includes.patch 898
+RMD160 f28029c21b7a187858c096d229f321dae859ff4f files/musicbrainz-3.0.1-gcc-4.3-includes.patch 898
+SHA256 82ea5f358c62400339a6196adbed43c81edbb573885f79cb28e4498c2d720e51 files/musicbrainz-3.0.1-gcc-4.3-includes.patch 898
 DIST libmusicbrainz-2.1.2.tar.gz 504432 RMD160 d1a243b42a6092b6fbf0c3e543bed9c8a403e9b7 SHA1 935e05850da03731a39d0c91082487aeb9fac9f3 SHA256 f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
 DIST libmusicbrainz-2.1.4.tar.gz 520569 RMD160 494ee9dac2cc571bb817519ce365ac89365aede6 SHA1 611c9e9404e5aac110173da0b3a03941d2a04d0c SHA256 3e08aeff58b31bd2b4553e07d65de0ef4eb93b48f36b3e4f01c5fc4dcb252803
 DIST libmusicbrainz-2.1.5.tar.gz 524243 RMD160 6b5da46c8d5e7c6359f847241705d8552665027b SHA1 99e85701541e41bb367e37e3a6ac47415fe8748f SHA256 c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0
@@ -21,14 +25,14 @@ EBUILD musicbrainz-2.1.5.ebuild 979 RMD160 6f063c1476423f620a52b870769867d311cc0
 MD5 d40fcdf82a04d0160d2eab63f5e8bedf musicbrainz-2.1.5.ebuild 979
 RMD160 6f063c1476423f620a52b870769867d311cc0011 musicbrainz-2.1.5.ebuild 979
 SHA256 8fd027af9ae3c7d8071aa506a8edd4fff1acd7a53cb38038fab04f7ff007a30f musicbrainz-2.1.5.ebuild 979
-EBUILD musicbrainz-3.0.1.ebuild 724 RMD160 ac18d4be0d2c095b01963a43d8d28768734af4f6 SHA1 c06f67d878f039b1cd24d5545add5d1439bf559f SHA256 b469cbad71ade6dfe6a1632bc2d9f94a2803faf5024650212f581e3caf760184
-MD5 1d8d5a344a2ce4c0e98f310578efbb74 musicbrainz-3.0.1.ebuild 724
-RMD160 ac18d4be0d2c095b01963a43d8d28768734af4f6 musicbrainz-3.0.1.ebuild 724
-SHA256 b469cbad71ade6dfe6a1632bc2d9f94a2803faf5024650212f581e3caf760184 musicbrainz-3.0.1.ebuild 724
-MISC ChangeLog 9953 RMD160 62d2fc883d7ded7925aa936f648e6938969398fe SHA1 82c69c1a2c7eaa05a13960450b276e9450ced741 SHA256 f8bae43bc0a209ad95ff4a1d352b63ab91e8be7112a4e599beb8ae9713aa77db
-MD5 e101dc22a0c31ad62299d48158865ba3 ChangeLog 9953
-RMD160 62d2fc883d7ded7925aa936f648e6938969398fe ChangeLog 9953
-SHA256 f8bae43bc0a209ad95ff4a1d352b63ab91e8be7112a4e599beb8ae9713aa77db ChangeLog 9953
+EBUILD musicbrainz-3.0.1.ebuild 824 RMD160 aedecd2d60cb32d52e83c3c0a638b56942780e30 SHA1 672e51cddec108bc597f51e82bb2da58fdb4dfae SHA256 0adebd6f8e60e50094c6061ca12f07fa994e20b106152986360aeee4a87d18cc
+MD5 cf019a5da76e3ed06abf234642148491 musicbrainz-3.0.1.ebuild 824
+RMD160 aedecd2d60cb32d52e83c3c0a638b56942780e30 musicbrainz-3.0.1.ebuild 824
+SHA256 0adebd6f8e60e50094c6061ca12f07fa994e20b106152986360aeee4a87d18cc musicbrainz-3.0.1.ebuild 824
+MISC ChangeLog 10190 RMD160 ae477deaf6f089f244fbd5254658208d267a9afc SHA1 749a9c49b160bcc89ba0b1aa00a98ed7cb61be65 SHA256 de7e6fbcd70185822df56053873f2ea10298d85db0d17dd4e86f3dee3be08f55
+MD5 62bc01007b8f119ec1f782ba98f7d3ac ChangeLog 10190
+RMD160 ae477deaf6f089f244fbd5254658208d267a9afc ChangeLog 10190
+SHA256 de7e6fbcd70185822df56053873f2ea10298d85db0d17dd4e86f3dee3be08f55 ChangeLog 10190
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -48,7 +52,7 @@ SHA256 3acf1113c60226d29d72d758e29de68cc4608eb66d022effa60e0d01b17bcb1e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd63XMACgkQvFcC4BYPU0pgyQCgpEPEZu53Z2UpEoVlboOekzjp
-UeEAoJLJTGdycpdmZrf2xy0kup4u0CGL
-=CNiX
+iEYEARECAAYFAkd80M8ACgkQvFcC4BYPU0rdNgCgg2RTHVVDCO4MW4zdtEV624pz
+SnYAn0nhfibH/4rBs1ENGaez/h+Mg3s4
+=+6bE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/musicbrainz/files/musicbrainz-3.0.1-gcc-4.3-includes.patch b/media-libs/musicbrainz/files/musicbrainz-3.0.1-gcc-4.3-includes.patch
new file mode 100644
index 000000000000..824f3254bca7
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-3.0.1-gcc-4.3-includes.patch
@@ -0,0 +1,22 @@
+diff -Naur libmusicbrainz-3.0.1-orig/src/utils_private.cpp libmusicbrainz-3.0.1/src/utils_private.cpp
+--- libmusicbrainz-3.0.1-orig/src/utils_private.cpp	2006-09-05 02:59:44.000000000 -0600
++++ libmusicbrainz-3.0.1/src/utils_private.cpp	2008-01-02 21:15:25.000000000 -0600
+@@ -20,6 +20,7 @@
+  * $Id: musicbrainz-3.0.1-gcc-4.3-includes.patch,v 1.1 2008/01/03 12:10:49 aballier Exp $
+  */
+  
++#include <cstdlib>
+ #include <cstring>
+ #include <cstdarg>
+ #include <iostream>
+diff -Naur libmusicbrainz-3.0.1-orig/src/webservice.cpp libmusicbrainz-3.0.1/src/webservice.cpp
+--- libmusicbrainz-3.0.1-orig/src/webservice.cpp	2007-05-11 16:55:10.000000000 -0600
++++ libmusicbrainz-3.0.1/src/webservice.cpp	2008-01-02 21:12:27.000000000 -0600
+@@ -24,6 +24,7 @@
+ #include <string>
+ #include <map>
+ #include <iostream>
++#include <stdlib.h>
+ #include <string.h>
+ #include <ne_session.h>
+ #include <ne_request.h>
diff --git a/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild b/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild
index 07937ac9387a..72e49ada101b 100644
--- a/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild,v 1.1 2008/01/02 00:17:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-3.0.1.ebuild,v 1.2 2008/01/03 12:10:49 aballier Exp $
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="Client library to access metadata of mp3/vorbis/CD media"
 HOMEPAGE="http://www.musicbrainz.org/"
@@ -23,6 +23,13 @@ S=${WORKDIR}/lib${P}
 
 CMAKE_IN_SOURCE_BUILD=true
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
+}
+
 src_install() {
 	cmake-utils_src_install
 	dodoc README.txt NEWS.txt AUTHORS.txt