diff options
| author | kristerw <kristerw@pkgsrc.org> | 2005-11-19 21:21:23 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2005-11-19 21:21:23 +0000 |
| commit | a4f8c86ae75bd6960ee570bde96f0171ef9ed34a (patch) | |
| tree | 7bbdbbc85c86c3f4c7094a8873b5526569facd21 /audio/timidity | |
| parent | 2348fcf70d03fa1c4da69259f91674d757e8d3a1 (diff) | |
| download | pkgsrc-a4f8c86ae75bd6960ee570bde96f0171ef9ed34a.tar.gz | |
Rename a local (static) variable that has the same name as an external
variable defined in a .h file. This makes the pkg build when using gcc 4.
Diffstat (limited to 'audio/timidity')
| -rw-r--r-- | audio/timidity/distinfo | 3 | ||||
| -rw-r--r-- | audio/timidity/patches/patch-ab | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo index bd86236caee..ac9c5f01ee1 100644 --- a/audio/timidity/distinfo +++ b/audio/timidity/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2005/02/23 20:39:52 agc Exp $ +$NetBSD: distinfo,v 1.11 2005/11/19 21:21:23 kristerw Exp $ SHA1 (TiMidity++-2.13.2.tar.bz2) = 8e603146e1164335303a5ac5dff291f369241b4e RMD160 (TiMidity++-2.13.2.tar.bz2) = 0156221846a88abef9312700a050972d85084fd8 Size (TiMidity++-2.13.2.tar.bz2) = 1581230 bytes SHA1 (patch-aa) = 3e006fe39bcc2644b7cea30ffce318091e1b8915 +SHA1 (patch-ab) = 6c4938e1b31dc066354aebd364c848bb88b20eb4 SHA1 (patch-ae) = 3f55ea58e91bd97ff42fbe67e8c89514c29aa2e9 diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab new file mode 100644 index 00000000000..9db395e5d12 --- /dev/null +++ b/audio/timidity/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.13 2005/11/19 21:21:23 kristerw Exp $ + +--- interface/xaw_i.c.orig 2005-11-19 21:56:48.000000000 +0100 ++++ interface/xaw_i.c 2005-11-19 21:58:44.000000000 +0100 +@@ -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 xvoices = 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; ++ xvoices = 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, xvoices); + 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)); |