Fix building with gcc-4.3 (and 4.4). Patch by Tyler Cordrey <tcordrey AT umd DOT edu>; bug #251217

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 105 insertions, 4 deletions

diff --git a/media-sound/audicle/ChangeLog b/media-sound/audicle/ChangeLog
index e82e7041d06d..dfeb255fb079 100644
--- a/media-sound/audicle/ChangeLog
+++ b/media-sound/audicle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audicle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.2 2008/04/27 11:12:59 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/ChangeLog,v 1.3 2009/06/28 21:28:03 halcy0n Exp $
+
+  27 Jun 2009; Mark Loeser <halcy0n@gentoo.org> audicle-1.0.0.6.ebuild,
+  +files/audicle-1.0.0.6-gcc43.patch:
+  Fix building with gcc-4.3 (and 4.4). Patch by Tyler Cordrey <tcordrey AT
+  umd DOT edu>; bug #251217
 
   27 Apr 2008; Cédric Krier <cedk@gentoo.org> audicle-1.0.0.6.ebuild:
   Add LEX, YACC variable and missing pkg-config DEPEND for bug #218614
diff --git a/media-sound/audicle/audicle-1.0.0.6.ebuild b/media-sound/audicle/audicle-1.0.0.6.ebuild
index f5121532057e..bc17cbd830ca 100644
--- a/media-sound/audicle/audicle-1.0.0.6.ebuild
+++ b/media-sound/audicle/audicle-1.0.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/audicle-1.0.0.6.ebuild,v 1.2 2008/04/27 11:12:59 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/audicle-1.0.0.6.ebuild,v 1.3 2009/06/28 21:28:03 halcy0n Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -32,6 +32,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-font.patch"
 	epatch "${FILESDIR}/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	sed -i \
 		-e "s@../ftgl_lib/FTGL/include@/usr/include/FTGL@" \
diff --git a/media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch
new file mode 100644
index 000000000000..71a999fb6e30
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.6-gcc43.patch
@@ -0,0 +1,95 @@
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/chuck_vm.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/chuck_vm.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/chuck_vm.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/chuck_vm.cpp	2009-06-27 16:45:36.000000000 -0400
+@@ -47,6 +47,7 @@
+ #else
+   #include <unistd.h>
+   #include <pthread.h>
++  #include <algorithm>
+ #endif
+ 
+ 
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/rtaudio.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/rtaudio.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/rtaudio.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/rtaudio.cpp	2009-06-27 16:47:50.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include "chuck_errmsg.h"
+ #include "digiio_rtaudio.h"
+ #include <stdio.h>
++#include <climits>
+ // old
+ // #include "RtAudio.h"
+ // #include <iostream>
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_stk.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_stk.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_stk.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_stk.cpp	2009-06-27 16:48:30.000000000 -0400
+@@ -41,7 +41,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <float.h>
+-
++#include <climits>
+ 
+ 
+ 
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_xxx.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_xxx.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/ugen_xxx.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/ugen_xxx.cpp	2009-06-27 16:51:21.000000000 -0400
+@@ -2587,7 +2587,7 @@
+         // open it
+         SF_INFO info;
+         info.format = 0;
+-        char * format = strrchr( filename, '.');
++        const char * format = strrchr( filename, '.');
+         if( format && strcmp( format, ".raw" ) == 0 )
+         { 
+             fprintf( stderr, "[chuck](via SndBuf) %s :: type is '.raw'...\n    assuming 16 bit signed mono (PCM)\n", filename );
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_hid.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_hid.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_hid.cpp	2009-06-27 16:53:26.000000000 -0400
+@@ -37,6 +37,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <climits>
+ 
+ using namespace std;
+ 
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_opsc.cpp audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_opsc.cpp
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_opsc.cpp	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_opsc.cpp	2009-06-27 16:53:03.000000000 -0400
+@@ -56,6 +56,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <algorithm>
+ #endif
+ 
+ #if defined(__MACOSX_CORE__)
+diff -ur audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_string.h audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_string.h
+--- audicle-1.0.0.6-orig/lang/chuck-1.2.1.1/src/util_string.h	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/lang/chuck-1.2.1.1/src/util_string.h	2009-06-27 16:52:32.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+ 
+ 
+ // itoa
+diff -ur audicle-1.0.0.6-orig/src/audicle_def.h audicle-1.0.0.6/src/audicle_def.h
+--- audicle-1.0.0.6-orig/src/audicle_def.h	2009-06-27 16:41:29.000000000 -0400
++++ audicle-1.0.0.6/src/audicle_def.h	2009-06-27 16:44:42.000000000 -0400
+@@ -39,8 +39,9 @@
+ 
+ #include "chuck_def.h"
+ 
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
++#include <algorithm>
+ #include <assert.h>
+ #ifndef __PLATFORM_WIN32__
+   #include <unistd.h>
+