Fix build with gcc 4.3 without alsa, thanks to Michał W. <michal@gen2.org> for reporting in bug #234754

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 33 insertions, 4 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 3439e39fc84f..8085941d6264 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.64 2008/05/19 19:49:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.65 2008/08/14 20:58:14 aballier Exp $
+
+  14 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/hydrogen-0.9.3-gcc43noalsa.patch, hydrogen-0.9.3-r3.ebuild:
+  Fix build with gcc 4.3 without alsa, thanks to Michał W.
+  <michal@gen2.org> for reporting in bug #234754
 
 *hydrogen-0.9.3-r3 (19 May 2008)
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index b2083899c3ef..656850985e29 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0
 AUX hydrogen-0.9.2-configure.in.patch 1346 RMD160 1dc980254521d44bf9413ae50fb61e4af2270ebe SHA1 98cbdd9934b47428622a2fb6ee3ea3857f973401 SHA256 c7c030d16087a2ec0b22f39181fc087e078c8cf0cf9d487b36f15c53e36b5be6
 AUX hydrogen-0.9.3-automagic.patch 751 RMD160 74d609894205b9edf52502ed9294c3f2485ac1de SHA1 281fc7cd9597dfd01e4abc6abffe2715b02d922c SHA256 0d63352c7269d07667735949f8be4637ec63a3b3bcdd46d2c764cb9d019721a7
@@ -5,8 +8,16 @@ AUX hydrogen-0.9.3-desktop-noexec.patch 571 RMD160 55bdfa6c332d6a33241ae93bafcb2
 AUX hydrogen-0.9.3-flac113.patch 1065 RMD160 c49ee2d09aab98ea9f93639d86bc60e90fa595e0 SHA1 a4a034bab94b71f9d9dc9a546b05d9509a2411a0 SHA256 6c9024c257217d7b5cdcd8cfe50746274186435a82d1cda5d4bfd02a0ad70232
 AUX hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356 RMD160 0d45efab658cff07be032d36fc1523f373d0ef54 SHA1 b170e964748a42016e8f8d2b0fe058d0b3e758b9 SHA256 cc653b60dce63e709e318935790bd0f292edb6afb4114352cbcedc8573f085a4
 AUX hydrogen-0.9.3-gcc43.patch 2434 RMD160 3cae0403a3b41e52c593d94447ab5bfb8eadd131 SHA1 9d333eb4d4fe5e8b73b1cfbbc07db80b623bf479 SHA256 99093e4ed118353af79d1323f303cdd78e8a3b73b338584360183c7f3c1f488e
+AUX hydrogen-0.9.3-gcc43noalsa.patch 346 RMD160 99b3b287b912a207b834a49b39a7e004785489e9 SHA1 f98d51f15de1f25717e36c96780e05905933c1a2 SHA256 9ddf776a7d6627d2ce08d52ce7696a3f7a4802001064c974af0f085f48a95c98
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
 EBUILD hydrogen-0.9.3-r2.ebuild 3434 RMD160 3c9611bf2ca26becb4a52dac84306401f8f06ab4 SHA1 cc4220482e369447b0aca4e3df50055fae74c6c9 SHA256 261579d9c836e7126e4fa837fd47148ab374818df0d76c0d9864aafa4fab0d10
-EBUILD hydrogen-0.9.3-r3.ebuild 3426 RMD160 eda6b787eff44542bfc93e0772dccea6de74fe4c SHA1 c7a4746d6236e64358e7f43af362803b5684b65a SHA256 e1e7147713c65897a04245a7f58a457cb17587607adab4886824be56707e1efd
-MISC ChangeLog 10568 RMD160 506770fc913467a4edd0418eb2b09ce2ccc1e5e0 SHA1 5d5ee5815c6b3f74db0b14400af95ab8f6670e77 SHA256 78ada4f27a9c7c6b96989f4989821a46c9cb9e5cda267483a46ad71acba2d152
+EBUILD hydrogen-0.9.3-r3.ebuild 3475 RMD160 913e55e9e3e99c956c80edfdc27ccd11400691d6 SHA1 31dbf498d1337e4f4bbd10c4346970e1e97989a6 SHA256 baaaa8a2f70119fa4c4707c214f3cfe7dcabef8891f1ad60d2533266f5a34838
+MISC ChangeLog 10803 RMD160 9d6c158aabb91354d82a9992d5a4d1724889bb03 SHA1 5d21ef959e06a659a5b2d5f9d36342268729cb42 SHA256 49570641cbdcf9915dc6a0bac743f809b45fd6c4c2616396f8087b10561f70c8
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiknGwACgkQvFcC4BYPU0o8WgCgigQ4Wo2Ns7vg7B6eIt/lUpzl
+QRMAn1U59qgHqH2tkDgNdSU2VaIQ5G4f
+=ygSQ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43noalsa.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43noalsa.patch
new file mode 100644
index 000000000000..460bc9c4e488
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43noalsa.patch
@@ -0,0 +1,12 @@
+Index: hydrogen-0.9.3/src/lib/Hydrogen.cpp
+===================================================================
+--- hydrogen-0.9.3.orig/src/lib/Hydrogen.cpp
++++ hydrogen-0.9.3/src/lib/Hydrogen.cpp
+@@ -37,6 +37,7 @@
+ #include <deque>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ #include <math.h>
+ using std::cout;
+ using std::cerr;
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild
index 7287a93dd978..b903d22a3543 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild,v 1.1 2008/05/19 19:49:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild,v 1.2 2008/08/14 20:58:14 aballier Exp $
 
 inherit eutils kde-functions autotools multilib
 
@@ -63,6 +63,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-automagic.patch"
 	epatch "${FILESDIR}/${P}-desktop-noexec.patch"
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gcc43noalsa.patch"
 	eautoreconf
 }