Added patch to fix gcc2 compile (Bug #40515). Added =dev-libs/fftw-2* to DEPEND (Bug #40514). Both fixes thanks to Tristan Henderson <T.Henderson@cs.ucl.ac.uk>.

4 files changed, 36 insertions, 7 deletions

diff --git a/media-sound/galan/ChangeLog b/media-sound/galan/ChangeLog
index 3f3893092dcf..e6bae864f752 100644
--- a/media-sound/galan/ChangeLog
+++ b/media-sound/galan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/galan
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.5 2004/02/04 13:04:42 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.6 2004/02/06 18:44:58 eradicator Exp $
+
+  06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  galan-0.3.0_beta3.ebuild, files/galan-0.3.0_beta3-gcc2_fix.patch:
+  Added patch to fix gcc2 compile (Bug #40515). Added =dev-libs/fftw-2* to
+  DEPEND (Bug #40514). Both fixes thanks to Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk>.
 
 *galan-0.3.0_beta3 (04 Feb 2004)
 
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
index d7dc5a75dee8..402825c06df0 100644
--- a/media-sound/galan/Manifest
+++ b/media-sound/galan/Manifest
@@ -1,7 +1,8 @@
-MD5 4ae693d7275b6532f7d773f4daf1c43e ChangeLog 1093
-MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
 MD5 b29ffec49dcee35f05a891537fe63d52 galan-0.2.14.ebuild 1070
-MD5 c2a08090bcca281b1ba5c6fcdff2177f galan-0.3.0_beta3.ebuild 1048
+MD5 258acba55d2fa86b733c1bad7b6c22ea galan-0.3.0_beta3.ebuild 1110
+MD5 bdcd37bafe9a4c107cf6ad161698cd99 ChangeLog 1389
+MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
 MD5 38bdd7c55254e5267b7daa66e27d1fea files/digest-galan-0.2.14 64
-MD5 668c3cbf5e2328e1b8b5137d32b2d10a files/digest-galan-0.3.0_beta3 70
 MD5 f291c312c9ac1307d9821704d09ed26b files/galan-0.2.14-alsalib-fix.patch 1862
+MD5 668c3cbf5e2328e1b8b5137d32b2d10a files/digest-galan-0.3.0_beta3 70
+MD5 80af60dfcd3796ed3347b6a5306dba94 files/galan-0.3.0_beta3-gcc2_fix.patch 726
diff --git a/media-sound/galan/files/galan-0.3.0_beta3-gcc2_fix.patch b/media-sound/galan/files/galan-0.3.0_beta3-gcc2_fix.patch
new file mode 100644
index 000000000000..c5d518692d3f
--- /dev/null
+++ b/media-sound/galan/files/galan-0.3.0_beta3-gcc2_fix.patch
@@ -0,0 +1,20 @@
+diff -Naur galan-0.3.0_beta3.orig/plugins/filerequester.la.c galan-0.3.0_beta3/plugins/filerequester.la.c
+--- galan-0.3.0_beta3.orig/plugins/filerequester.la.c	2004-01-22 10:02:36.000000000 -0500
++++ galan-0.3.0_beta3/plugins/filerequester.la.c	2004-02-05 13:01:26.000000000 -0500
+@@ -69,6 +69,7 @@
+ 
+ PRIVATE gpointer req_thread( Generator *g ) {
+ 
++    GtkWidget *fs;
+     Data *data = g->data;
+ 
+     while( 1 ) {
+@@ -79,7 +80,7 @@
+ 
+ 	    gdk_threads_enter();
+ 	    
+-	    GtkWidget *fs = gtk_file_selection_new("Select File");
++	    fs = gtk_file_selection_new("Select File");
+ 
+ 	    gtk_object_set_data(GTK_OBJECT(fs), "Generator", g);
+ 	    gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), "clicked",
diff --git a/media-sound/galan/galan-0.3.0_beta3.ebuild b/media-sound/galan/galan-0.3.0_beta3.ebuild
index 76965b27aed0..59fa06b89213 100644
--- a/media-sound/galan/galan-0.3.0_beta3.ebuild
+++ b/media-sound/galan/galan-0.3.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.3.0_beta3.ebuild,v 1.1 2004/02/04 13:04:42 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.3.0_beta3.ebuild,v 1.2 2004/02/06 18:44:58 eradicator Exp $
 
 DESCRIPTION="gAlan - Graphical Audio Language"
 SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
@@ -23,10 +23,12 @@ DEPEND=">=x11-libs/gtk+-2.0
 	media-libs/liblrdf
 	media-libs/ladspa-sdk
 	media-libs/audiofile
-	media-libs/libsndfile"
+	media-libs/libsndfile
+	=dev-libs/fftw-2*"
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
 
 src_compile() {