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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 118 insertions, 6 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/Manifest b/media-sound/audicle/Manifest
index 32bc22844635..ee218f555364 100644
--- a/media-sound/audicle/Manifest
+++ b/media-sound/audicle/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX audicle-1.0.0.6-font.patch 2862 RMD160 12edc5098b4ae21adbdcc0eaef7b6c386329dd44 SHA1 2d0845bad78570b084087f4489c86bb24f6eabd2 SHA256 ca958277aaead8c7cfe4f02a4ee78a0ba3d527bfb61857f4e349ad8f1389c152
+AUX audicle-1.0.0.6-gcc43.patch 3747 RMD160 90ec72eeb2038965d660511c712043a42184ee7d SHA1 73caf64faf837c31ed71fb2d091b42d890156ed9 SHA256 f4384983659a18d1eeff51f5de8434d874284b427aa5c8d0129465d904a17b35
 AUX audicle-1.0.0.6-hid-smc.patch 3105 RMD160 759c6d34beb8fb00be475f7c82f2f313d4f22e6c SHA1 21e2b0875483598ed5fdeabd07911b59d98d00c4 SHA256 051cffc2db8207f5e78cec4fa059580fc734c57d00b0055eb9de7a67b10c462d
 DIST audicle-1.0.0.6.tgz 5531625 RMD160 66a4a69b2a7dbe0d8aa705358f71c0d8df312a3e SHA1 c8967cfb3238064fb12cb91d0fcf19dc90628bb4 SHA256 685b86a263e92be279ccbae001202b159175363ecc87d8a7bc521f8a42a92f90
-EBUILD audicle-1.0.0.6.ebuild 2220 RMD160 d1c76d7c247824aa6e61bbb70bac2ed76cd36158 SHA1 76884066db6dde0564e338692a8b0fff85d43748 SHA256 a84efc35cb30f96d2e2f34f829c14648f90c655dceaa013c0084f173e4b77472
-MISC ChangeLog 578 RMD160 21a1ecb4d9f255164b85018d43916f2fc99f204f SHA1 3df69e03573bd58e68569033572a13d3b6a14cdf SHA256 32256c1b32b5703d0e1f7edc451b526f0ffd7ce8bd5b2599d3b30df5755f5bb5
+EBUILD audicle-1.0.0.6.ebuild 2262 RMD160 c73071968a744ae475e9deb2eff9bee40075f81a SHA1 22f589c9b16d6b02e8a54b5f3639aeebcd3516b6 SHA256 5a0a2f4ed4f3e71a52d3ddd803574615d201e8fe2108862ec25fcf710bfcd457
+MISC ChangeLog 795 RMD160 2bed2ce13fbe4a12559829aa3796bd8dccc5b4cc SHA1 5c7cc9b58bc61c06f853d1d093f29203e68b8232 SHA256 e62465a1cdfa2d1616a8b0f9bd2017c9a3be8835224a469af12818f48f651518
 MISC metadata.xml 472 RMD160 4062e70f23fec1b713ec4661229c94fe3b5977e5 SHA1 37e6ab7cdce21b32d6c434bfaf2a23d03ea70499 SHA256 5bafa4cb9fb7a68864b326ac3b15881be3e2f9e52f0b23f47d50581e4998d895
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpGj1EACgkQCRZPokWLroTXMwCgzVl8csIrgNGnNB6gUS+SbxVo
+fH0An2Ckjc0fWRRpojKIay00ZyMAhhrm
+=BnYo
+-----END PGP SIGNATURE-----
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>
+