gcc 4.3 build fix by Peter Alfredsen <peter.alfredsen@gmail.com> in bug #218425

(Portage version: 2.1.5_rc5)

3 files changed, 83 insertions, 2 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index b217629a93fa..0f42e5c794ba 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.62 2008/01/14 19:07:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.63 2008/04/20 18:14:52 aballier Exp $
+
+  20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/hydrogen-0.9.3-gcc43.patch, hydrogen-0.9.3-r2.ebuild:
+  gcc 4.3 build fix by Peter Alfredsen <peter.alfredsen@gmail.com> in bug
+  #218425
 
   14 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   hydrogen-0.9.3-r2.ebuild:
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43.patch
new file mode 100644
index 000000000000..6cfb40844d53
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc43.patch
@@ -0,0 +1,75 @@
+diff -NrU5 hydrogen-0.9.3.orig/src/gui/DrumkitManager.h hydrogen-0.9.3/src/gui/DrumkitManager.h
+--- hydrogen-0.9.3.orig/src/gui/DrumkitManager.h	2008-04-19 16:48:03.000000000 +0200
++++ hydrogen-0.9.3/src/gui/DrumkitManager.h	2008-04-19 16:48:46.000000000 +0200
+@@ -41,10 +41,11 @@
+ #include <qtextedit.h>
+ #include <qtimer.h>
+ #include <qwidget.h>
+ 
+ #include <vector>
++#include <cstdlib>
+ 
+ #include "UI/DrumkitManager_UI.h"
+ #include "lib/Object.h"
+ #include "lib/Song.h"
+ 
+diff -NrU5 hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp
+--- hydrogen-0.9.3.orig/src/gui/main.cpp	2008-04-19 16:48:03.000000000 +0200
++++ hydrogen-0.9.3/src/gui/main.cpp	2008-04-19 16:48:46.000000000 +0200
+@@ -41,10 +41,11 @@
+ #include "lib/Preferences.h"
+ #include "lib/DataPath.h"
+ #include "lib/Exception.h"
+ 
+ #include <iostream>
++#include <cstdlib>
+ using namespace std;
+ 
+ void showInfo();
+ void showUsage();
+ 
+diff -NrU5 hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp
+--- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp	2008-04-19 16:48:04.000000000 +0200
++++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp	2008-04-19 16:50:09.000000000 +0200
+@@ -28,10 +28,11 @@
+ #ifdef OSS_SUPPORT
+ 
+ #include "../Preferences.h"
+ 
+ #include <pthread.h>
++#include <cstring>
+ 
+ audioProcessCallback ossDriver_audioProcessCallback;
+ bool ossDriver_running;
+ pthread_t ossDriverThread;
+ int oss_driver_bufferSize = -1;
+diff -NrU5 hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp
+--- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp	2008-04-19 16:48:04.000000000 +0200
++++ hydrogen-0.9.3/src/lib/FLACFile.cpp	2008-04-19 16:48:46.000000000 +0200
+@@ -25,10 +25,11 @@
+ #include "FLACFile.h"
+ #include "Sample.h"
+ 
+ #include <vector>
+ #include <fstream>
++#include <cstring>
+ 
+ #ifdef FLAC_SUPPORT
+ 
+ //#include "FLAC/file_decoder.h"
+ #include <FLAC++/all.h>
+diff -NrU5 hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp
+--- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp	2008-04-19 16:48:04.000000000 +0200
++++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp	2008-04-19 16:48:46.000000000 +0200
+@@ -26,10 +26,11 @@
+ #include <qapplication.h>
+ 
+ #include <iostream>
+ #include <stdio.h>
+ #include <string>
++#include <cstdlib>
+ 
+ #include "lib/Hydrogen.h"
+ #include "lib/LocalFileMng.h"
+ #include "lib/Preferences.h"
+ #include "lib/fx/LadspaFX.h"
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
index f71593339a57..bdaf910d11ae 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r2.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-r2.ebuild,v 1.11 2008/01/14 19:07:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild,v 1.12 2008/04/20 18:14:52 aballier Exp $
 
 inherit eutils kde-functions autotools multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-flac113.patch"
 	epatch "${FILESDIR}/${P}-automagic.patch"
 	epatch "${FILESDIR}/${P}-desktop-noexec.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 	eautoreconf
 }