gcc4 patch; bug #89933

(Portage version: 2.0.51.22-r1)

4 files changed, 46 insertions, 20 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b8295ef00a9a..5e8f089edfaf 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.50 2005/05/28 17:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.51 2005/06/26 02:03:45 halcy0n Exp $
+
+  26 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/timidity++-2.13.2-gcc4.patch, timidity++-2.13.2-r2.ebuild:
+  GCC4 patch, thanks to <sunmoon1997@gmail.com> for the patch; bug #89933
 
   28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
   timidity++-2.13.2.ebuild, timidity++-2.13.2-r2.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 1af446d37f52..6cee04d40ded 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7df488c2801b33fe1329ba4332752dec timidity++-2.13.2-r2.ebuild 4083
-MD5 9f4577390a0c51d8cddc4d8829bfc3cc timidity++-2.13.2.ebuild 3852
 MD5 a46ed49ad25c1bbd5c668bd6cd274228 ChangeLog 8557
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
-MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2-r2 71
-MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
-MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
+MD5 9f4577390a0c51d8cddc4d8829bfc3cc timidity++-2.13.2.ebuild 3852
+MD5 9352d62014d4088d1523b2badd0e8ee6 timidity++-2.13.2-r2.ebuild 4119
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
-MD5 31bdaea612f18e2c3d45a8a73ab44c81 files/timidity++-2.13.2-exiterror.patch 21406
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
+MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
 MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
-MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
+MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
 MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCmKkv06ebR+OMO78RAsY8AJ90aWa4l3rs1SxtChCcccbDTDtxegCdHNDv
-hLfPou91YqU79pcMypr5Tws=
-=T82e
------END PGP SIGNATURE-----
+MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2-r2 71
+MD5 31bdaea612f18e2c3d45a8a73ab44c81 files/timidity++-2.13.2-exiterror.patch 21406
+MD5 0868926c5290817cacb9a1849bc043c2 files/timidity++-2.13.2-gcc4.patch 1325
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-gcc4.patch b/media-sound/timidity++/files/timidity++-2.13.2-gcc4.patch
new file mode 100644
index 000000000000..af0b5f8f7db0
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-gcc4.patch
@@ -0,0 +1,30 @@
+diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
+--- TiMidity++-2.13.2-orig/interface/xaw_i.c	2005-06-25 21:55:19.000000000 -0400
++++ TiMidity++-2.13.2/interface/xaw_i.c	2005-06-25 21:56:01.000000000 -0400
+@@ -261,7 +261,7 @@
+ String bitmapdir = XAW_BITMAP_DIR;
+ Boolean arrangetitle,savelist;
+ static char **current_flist = NULL;
+-static int voices = 0, last_voice = 0, voices_num_width;
++static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
+ static int maxentry_on_a_menu = 0,submenu_n = 0;
+ #define OPTIONS_WINDOW 1
+ #define FLIST_WINDOW 2
+@@ -1329,7 +1329,7 @@
+     c= *(local_buf+1);
+     n= atoi(local_buf+2);
+     if(c == 'L')
+-      voices = n;
++      xaw_i_voices = n;
+     else
+       last_voice = n;
+     if(IsTracePlaying()) drawVoices();
+@@ -2070,7 +2070,7 @@
+   XSetForeground(disp, gct, tracecolor);
+   XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
+                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
+-  sprintf(local_buf, "%3d/%d", last_voice, voices);
++  sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
+   XSetForeground(disp, gct, capcolor);  
+   XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
+               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
diff --git a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
index 1276b65b0d1b..6be513b7f090 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.2 2005/05/28 17:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.3 2005/06/26 02:03:45 halcy0n Exp $
 
 IUSE="oss nas esd motif X gtk gtk2 vorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
 
@@ -46,6 +46,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gtk26.patch
 	epatch ${FILESDIR}/${P}-exiterror.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c