gcc 4.3 build fix

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 49 insertions, 7 deletions

diff --git a/media-sound/linuxsampler/ChangeLog b/media-sound/linuxsampler/ChangeLog
index 1332dccda759..06f9fb8e41a2 100644
--- a/media-sound/linuxsampler/ChangeLog
+++ b/media-sound/linuxsampler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/linuxsampler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.11 2008/05/16 21:05:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.12 2008/07/13 14:23:40 aballier Exp $
+
+  13 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/linuxsampler-0.5.1-gcc43.patch, linuxsampler-0.5.1.ebuild:
+  gcc 4.3 build fix
 
   16 May 2008; Alexis Ballier <aballier@gentoo.org>
   +files/linuxsampler-0.5.1-libtool22.patch, linuxsampler-0.5.1.ebuild:
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 77b9d1c3e399..8044ef0a49f9 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX linuxsampler-0.5.1-gcc43.patch 1258 RMD160 4e17571be94a73e8cf3bd36bc33e3bfea6f59684 SHA1 bcbfe14d7a0f00e09269d2b264d6f7ac17723107 SHA256 948b0f11181d90ac894c8d34c14187efb6e1bddc7024a344ec59cc8af9944465
 AUX linuxsampler-0.5.1-libtool22.patch 828 RMD160 a7c811ad2e04686bf550f0c0a31d8613c880baa2 SHA1 39c7cce3a0d1cc446cd351c8ac10fbea0f696215 SHA256 e5ab332f44dcfce5ef7238388bafc86dc97ab744dc91146bfef81f243fcd49e0
 AUX linuxsampler-0.5.1-pkgconfiginit.patch 389 RMD160 5140576b463ad73c2424ff07fea90081e83c5d37 SHA1 854e08bf8bc85d451a534b76f861e7c36edffd5c SHA256 78dc73457d8976dde888eef8aa1265a018b6634fc012b3f2305b5bd09dc041a2
 DIST linuxsampler-0.5.1.tar.bz2 614500 RMD160 ea964c5033b3d44c1b5b72cb2447496cbd736992 SHA1 ceecf9751c20cd8e05c3c0056bbf7fb14ecb33e6 SHA256 e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f
-EBUILD linuxsampler-0.5.1.ebuild 1290 RMD160 2525f1e6ad26a17a821dbdb08679f1afa79a1d8d SHA1 70e9a3e1f8cc1a394f0e60a61bdfbf496aeaa955 SHA256 c2ee038599214c212d237ab429d6106a1db0be5febb2dbb3b36b7dbbdc14f0e1
-MISC ChangeLog 2104 RMD160 6ed6c172e73cdf93073ba85d8c025495c2e5e367 SHA1 5275b7c291984aaab7f4e84902cb6056d68d1f44 SHA256 3b02d699b70c2cd95ff3d499874da77f2cb0a068d26e0d9904ec5f8a9a483488
+EBUILD linuxsampler-0.5.1.ebuild 1329 RMD160 7f6616ada55cc86a44f58392cf929308cb7a3c8f SHA1 3ca4135f5deac1b700684dbb56f11a5f6b369845 SHA256 0bc90170d47069509452742bed6ce23596dff428785dcb0039714601c1be600d
+MISC ChangeLog 2245 RMD160 11e70480e03813e31e43d91c2fb737ef2e49e555 SHA1 75e6b4f17fbdb6cd5adb5eccba07e637c0c7f871 SHA256 ac50eae4d5add51028647775e5dffc9bf06196c2152fbf0cafda30d016674a12
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgt9woACgkQvFcC4BYPU0r+VgCgvo/QpQap0S9y3rLW7vsXlYtA
-cYUAnAjCmczCjrZEsJbmB3JlAbY82hMv
-=Qp0Y
+iEYEARECAAYFAkh6D/MACgkQvFcC4BYPU0osRgCfRo0AaqqlYLorCcH9wckJdBvj
+aXsAnRtH7iPdZsWDRy+E5HJGy47DUok1
+=PWs0
 -----END PGP SIGNATURE-----
diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch b/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
new file mode 100644
index 000000000000..e65c6cbb1065
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
@@ -0,0 +1,36 @@
+Index: linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
+===================================================================
+--- linuxsampler-0.5.1.orig/src/db/InstrumentsDbUtilities.h
++++ linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
+@@ -24,6 +24,7 @@
+ #define __LS_INSTRUMENTSDBUTILITIES_H__
+ 
+ #include <vector>
++#include <memory>
+ #include <gig.h>
+ #include <sqlite3.h>
+ #include <sys/stat.h>
+Index: linuxsampler-0.5.1/src/drivers/midi/midi.h
+===================================================================
+--- linuxsampler-0.5.1.orig/src/drivers/midi/midi.h
++++ linuxsampler-0.5.1/src/drivers/midi/midi.h
+@@ -21,6 +21,7 @@
+ #ifndef __LS_MIDI_H__
+ #define __LS_MIDI_H__
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ namespace LinuxSampler {
+Index: linuxsampler-0.5.1/src/network/lscpserver.cpp
+===================================================================
+--- linuxsampler-0.5.1.orig/src/network/lscpserver.cpp
++++ linuxsampler-0.5.1/src/network/lscpserver.cpp
+@@ -21,6 +21,7 @@
+  *   MA  02111-1307  USA                                                   *
+  ***************************************************************************/
+ 
++#include <algorithm>
+ #include "lscpserver.h"
+ #include "lscpresultset.h"
+ #include "lscpevent.h"
diff --git a/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild b/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
index 4f500aff674b..b7c127e60368 100644
--- a/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-0.5.1.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/linuxsampler/linuxsampler-0.5.1.ebuild,v 1.2 2008/05/16 21:05:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild,v 1.3 2008/07/13 14:23:40 aballier Exp $
 
 inherit autotools eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-pkgconfiginit.patch"
 	epatch "${FILESDIR}/${P}-libtool22.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 	AT_M4DIR="m4" eautoreconf
 }