GCC 4.3 fix wrt #219546, thanks to Peter Alfredsen.

(Portage version: 2.1.5_rc6)

3 files changed, 63 insertions, 18 deletions

diff --git a/media-sound/spiralmodular/ChangeLog b/media-sound/spiralmodular/ChangeLog
index 2ee394898433..5b5260b535cd 100644
--- a/media-sound/spiralmodular/ChangeLog
+++ b/media-sound/spiralmodular/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/spiralmodular
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.20 2007/07/02 15:18:42 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.21 2008/04/28 17:01:35 drac Exp $
+
+  28 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/spiralmodular-0.2.2a-gcc43.patch, spiralmodular-0.2.2a-r1.ebuild:
+  GCC 4.3 fix wrt #219546, thanks to Peter Alfredsen.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   spiralmodular-0.2.1.ebuild:
diff --git a/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc43.patch b/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc43.patch
new file mode 100644
index 000000000000..3241ed02492f
--- /dev/null
+++ b/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc43.patch
@@ -0,0 +1,46 @@
+diff -NrU5 spiralmodular-0.2.2.orig/main.cpp spiralmodular-0.2.2/main.cpp
+--- spiralmodular-0.2.2.orig/main.cpp	2003-08-16 08:16:03.000000000 +0200
++++ spiralmodular-0.2.2/main.cpp	2008-04-28 00:37:48.000000000 +0200
+@@ -20,10 +20,11 @@
+ #include <config.h>
+ #endif
+ 
+ #include <iostream>
+ #include <cstdlib>
++#include <cstring>
+ #include <FL/Fl.H>
+ #include <FL/Fl_Tooltip.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+diff -NrU5 spiralmodular-0.2.2.orig/SpiralSound/ChannelHandler.C spiralmodular-0.2.2/SpiralSound/ChannelHandler.C
+--- spiralmodular-0.2.2.orig/SpiralSound/ChannelHandler.C	2003-02-21 01:51:15.000000000 +0100
++++ spiralmodular-0.2.2/SpiralSound/ChannelHandler.C	2008-04-28 00:49:15.000000000 +0200
+@@ -16,10 +16,12 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */ 
+ 
+ #include "ChannelHandler.h"
+ #include <unistd.h>
++#include <cstring>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+ //#define CHANNEL_DEBUG
+ 
+diff -NrU5 spiralmodular-0.2.2.orig/SpiralSound/Sample.h spiralmodular-0.2.2/SpiralSound/Sample.h
+--- spiralmodular-0.2.2.orig/SpiralSound/Sample.h	2003-07-23 00:08:41.000000000 +0200
++++ spiralmodular-0.2.2/SpiralSound/Sample.h	2008-04-28 00:47:01.000000000 +0200
+@@ -22,10 +22,11 @@
+ #define PLUGINGUI_IN_MODULE_TEST
+ 
+ #include <assert.h>
+ #include <limits.h>
+ #include <iostream>
++#include <cstring>
+ 
+ //#define DEBUG
+ 
+ inline float Linear(float bot,float top,float pos,float val1,float val2)
+ {
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
index f9132d3f6bbd..58b5691c72fd 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild,v 1.5 2007/05/01 00:23:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild,v 1.6 2008/04/28 17:01:35 drac Exp $
 
 inherit eutils multilib
 
-IUSE="alsa jack"
-
 DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
 HOMEPAGE="http://www.pawfal.org/Software/SSM/"
 SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.bz2"
@@ -13,6 +11,7 @@ SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
+IUSE="alsa jack"
 
 DEPEND=">=x11-libs/fltk-1.1
 	media-libs/libsndfile
@@ -25,9 +24,9 @@ S=${WORKDIR}/${PN}-0.2.2
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
@@ -46,18 +45,14 @@ src_compile() {
 		myconf="${myconf} --disable-alsa-midi"
 	fi
 
-	econf ${myconf} || die "configure failed"
-	emake || die
+	econf ${myconf}
+	emake || die "emake failed."
 }
 
 src_install() {
 	dodir /usr/bin /usr/$(get_libdir) /usr/share/man /usr/share/info
 	dodoc Examples/*
-	make bindir=${D}/usr/bin libdir=${D}/usr/$(get_libdir) mandir=${D}/usr/share/man infodir=${D}/usr/share/info datadir=${D}/usr/share install || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Remember to remove any old ~/.sprialmodular files"
-	elog
+	emake bindir="${D}/usr/bin" libdir="${D}/usr/$(get_libdir)" \
+		mandir="${D}/usr/share/man" infodir="${D}/usr/share/info" \
+		datadir="${D}/usr/share" install || die "emake install failed."
 }