Fix compilation with gcc-4.3 and 4.4 by Gene Seto <geneseto AT hotmail DOT com>; bug #251223

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

4 files changed, 183 insertions, 7 deletions

diff --git a/media-sound/miniaudicle/ChangeLog b/media-sound/miniaudicle/ChangeLog
index 0ea947ea9745..1c22afd7ad51 100644
--- a/media-sound/miniaudicle/ChangeLog
+++ b/media-sound/miniaudicle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/miniaudicle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.1 2008/03/29 23:21:04 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.2 2009/06/29 01:32:26 halcy0n Exp $
+
+  28 Jun 2009; Mark Loeser <halcy0n@gentoo.org> miniaudicle-0.1.3.8.ebuild,
+  +files/miniaudicle-0.1.3.8-gcc44.patch:
+  Fix compilation with gcc-4.3 and 4.4 by Gene Seto <geneseto AT hotmail DOT
+  com>; bug #251223
 
 *miniaudicle-0.1.3.8 (29 Mar 2008)
 
diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest
index 594b41082f6a..8bcb5603667e 100644
--- a/media-sound/miniaudicle/Manifest
+++ b/media-sound/miniaudicle/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX miniaudicle-0.1.3.8-gcc44.patch 6358 RMD160 229de4851c3e86e8d0fbca13ea415c71634f2b8f SHA1 26b3a58ab814a80eede9a8f0509175e7e4ee7108 SHA256 dacaf5680b766e115efd187dac773231d209d23f149d85c541be8724815c37c2
 AUX miniaudicle-0.1.3.8-hid-smc.patch 3101 RMD160 f8b325dd7da234c3bb85d13f3acc69e1a1f274c9 SHA1 7f4aa83ed7e437e90774f408f0c6392b53094121 SHA256 20c137254828b1638c5ef1aecb25d5eaa674fb3c723d98a45c41843e38bb3d73
 DIST miniAudicle-0.1.3.8.tgz 2253821 RMD160 d332fffb4cddadf3f144ffc84f7fd62ec6bc82be SHA1 fbebccaf90fe11951fb104848444bcda292df5a1 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6
-EBUILD miniaudicle-0.1.3.8.ebuild 1936 RMD160 2e35f6f28a8a51950ed33e99974f86ae597673f3 SHA1 bcab0c2bb2bbceb664caa03c530891a8086e40ca SHA256 df0a529020cf5f18b8e2a0a2a3b02542196d5b37aa040dad29a02aa10eaf0fbd
-MISC ChangeLog 420 RMD160 736949e14fa0114e382aa1a30ca3a481fb8b7ef7 SHA1 1f5f3b766c6e6e88d7ba9e54945a59318844bb9c SHA256 b78754bff3d55b639f757b2e373b37b0a0e87ae605086312cd910d038f61640f
+EBUILD miniaudicle-0.1.3.8.ebuild 1980 RMD160 a0d6be61edccce572cefcdf23f5c3039d4eb545d SHA1 c5ffef003e7d3e2d4d01bfcf81a4d66cccbbe995 SHA256 e23cc2781e59a014696569fc5364e2f56cea19a788c5794f1023bd2c426663b1
+MISC ChangeLog 639 RMD160 e8c29b6bbbd950432ada10d5998683d591ad25dd SHA1 fa4cf08d345091ab0489c86e475a284b2d5c8140 SHA256 90e4f5531471a47173eac79fb05cc42077d120e4c0bb0a82a2158e8dc223c636
 MISC metadata.xml 405 RMD160 33bef0e9877b6e20dcf8d558327eb775cace4084 SHA1 54acba4e626df4d51aed5cd2d855770cf45dff95 SHA256 bc3639b5d9f5b72f07a88b90aad07da64da85bb37bc3f7d9ab5d5a15a8d82fd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpGyJIACgkQCRZPokWLroSrEwCfb9dVQ48uIJrACXM8dtRLypO/
+bWQAoKAm/vdw89dyCUbJna6pC+PPtyPb
+=40ZX
+-----END PGP SIGNATURE-----
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
new file mode 100644
index 000000000000..7b1bc9c06d3e
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
@@ -0,0 +1,159 @@
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -47,6 +47,7 @@
+ #else
+   #include <unistd.h>
+   #include <pthread.h>
++  #include <algorithm>
+ #endif
+ 
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp	2009-06-27 21:15:00.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 miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <float.h>
++#include <climits>
+ 
+ 
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp	2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp	2009-06-27 21:15:31.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 miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp miniAudicle-0.1.3.8/chuck/src/util_hid.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_hid.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -37,6 +37,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <climits>
+ 
+ using namespace std;
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp	2009-06-27 21:15:00.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 miniAudicle-0.1.3.8-orig/chuck/src/util_string.h miniAudicle-0.1.3.8/chuck/src/util_string.h
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_string.h	2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_string.h	2009-06-27 21:16:12.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+ 
+ 
+ // itoa
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm miniAudicle-0.1.3.8/wxw/icons/add.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/add.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * add_xpm[] = {
++static const char * add_xpm[] = {
+ "32 32 47 1",
+ " 	c None",
+ ".	c #C3F8BE",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_blue_xpm[] = {
++static const char * led_blue_xpm[] = {
+ "28 28 431 2",
+ "  	c None",
+ ". 	c #949394",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm miniAudicle-0.1.3.8/wxw/icons/led-green.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-green.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_green_xpm[] = {
++static const char * led_green_xpm[] = {
+ "28 28 443 2",
+ "  	c None",
+ ". 	c #959696",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm miniAudicle-0.1.3.8/wxw/icons/led-off.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-off.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_off_xpm[] = {
++static const char * led_off_xpm[] = {
+ "28 28 143 2",
+ "  	c None",
+ ". 	c #959595",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm miniAudicle-0.1.3.8/wxw/icons/led-red.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-red.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_red_xpm[] = {
++static const char * led_red_xpm[] = {
+ "28 28 434 2",
+ "  	c None",
+ ". 	c #959594",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * miniAudicle_xpm[] = {
++static const char * miniAudicle_xpm[] = {
+ "128 128 1543 2",
+ "  	c None",
+ ". 	c #FF9D20",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm miniAudicle-0.1.3.8/wxw/icons/remove.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/remove.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * remove_xpm[] = {
++static const char * remove_xpm[] = {
+ "32 32 177 2",
+ "  	c None",
+ ". 	c #FFB6B5",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm miniAudicle-0.1.3.8/wxw/icons/replace.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/replace.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * replace_xpm[] = {
++static const char * replace_xpm[] = {
+ "32 32 114 2",
+ "  	c None",
+ ". 	c #5764FF",
+
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild
index cf69f6cc09e2..b4ed423f9aa3 100644
--- a/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8.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/miniaudicle/miniaudicle-0.1.3.8.ebuild,v 1.1 2008/03/29 23:21:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild,v 1.2 2009/06/29 01:32:26 halcy0n Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -41,7 +41,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "$FILESDIR/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-hid-smc.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
 }
 
 src_compile() {