Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 18694 Details for
Bug 30269
kdemultimedia fails to build with gcc-3.3.x
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patched kdemultimedia source fixing compile errors
kdemultimedia-3.1.4-gentoo-multiline.diff (text/plain), 14.55 KB, created by
Bryan Østergaard (RETIRED)
on 2003-10-03 13:10:22 UTC
(
hide
)
Description:
Patched kdemultimedia source fixing compile errors
Filename:
MIME Type:
Creator:
Bryan Østergaard (RETIRED)
Created:
2003-10-03 13:10:22 UTC
Size:
14.55 KB
patch
obsolete
>diff -ur kmidi/TIMIDITY/xaw_i.c kmidi/TIMIDITY/xaw_i.c >--- kmidi/TIMIDITY/xaw_i.c 2003-05-07 13:46:49.000000000 +0200 >+++ kmidi/TIMIDITY/xaw_i.c 2003-10-03 20:21:50.000000000 +0200 >@@ -2670,9 +2670,9 @@ > XtNbackingStore,NotUseful,XtNsaveUnder,False, > XtNwidth,menu_width, > NULL); >- snprintf(sbuf,sizeof(sbuf), "<BtnUp>: popdownSubmenu(%d) notify() unhighlight()\n\ >- <EnterWindow>: unhighlight()\n\ >- <LeaveWindow>: leaveSubmenu(%d) unhighlight()",submenu_n,submenu_n); >+ snprintf(sbuf,sizeof(sbuf), "<BtnUp>: popdownSubmenu(%d) notify() unhighlight()\n"\ >+ "<EnterWindow>: unhighlight()\n"\ >+ "<LeaveWindow>: leaveSubmenu(%d) unhighlight()",submenu_n,submenu_n); > XtOverrideTranslations(psmenu[submenu_n],XtParseTranslationTable(sbuf)); > tmpw = psmenu[submenu_n++]; psmenu[submenu_n] = NULL; > j = 0; >@@ -3078,9 +3078,9 @@ > #endif > "*Command.font: -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*", > "*Toggle.font: -adobe-helvetica-medium-o-*-*-12-*-*-*-*-*-*-*", >- "*MenuButton.translations:<EnterWindow>: highlight()\\n\ >- <LeaveWindow>: reset()\\n\ >- Any<BtnDown>: reset() fix-menu() PopupMenu()", >+ "*MenuButton.translations:<EnterWindow>: highlight()\\n"\ >+ "<LeaveWindow>: reset()\\n"\ >+ "Any<BtnDown>: reset() fix-menu() PopupMenu()", > "*menu_box.borderWidth: 0", > "*button_box.borderWidth: 0", > "*button_box.horizDistance: 4", >@@ -3177,8 +3177,8 @@ > #ifndef WIDGET_IS_LABEL_WIDGET > "*lyric_text.height: 120", > "*lyric_text.scrollVertical: WhenNeeded", >- "*lyric_text.translations: #override\\n\ >- <Btn2Down>: do-deltext()", >+ "*lyric_text.translations: #override\\n"\ >+ "<Btn2Down>: do-deltext()", > #else > "*lyric_text.height: 30", > "*lyric_text.label: MessageWindow", >@@ -3230,33 +3230,33 @@ > "*time_label.font: -adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*", > "*BitmapDir: " XAW_BITMAP_DIR "/", > #ifdef XAW3D >- "*volume_bar.translations: #override\\n\ >- ~Ctrl Shift<Btn1Down>: do-volupdown(-50)\\n\ >- ~Ctrl Shift<Btn3Down>: do-volupdown(50)\\n\ >- Ctrl ~Shift<Btn1Down>: do-volupdown(-5)\\n\ >- Ctrl ~Shift<Btn3Down>: do-volupdown(5)\\n\ >- <Btn1Down>: MoveThumb()\\n\ >- <BtnUp>: NotifyScroll(FullLength) EndScroll()", >- "*tune_bar.translations: #override\\n\ >- <Btn1Up>: do-tuneset()\\n\ >- <Btn3Up>: do-tuneslide()\\n\ >- <Btn1Down>: MoveThumb()\\n\ >- <BtnUp>: NotifyScroll(FullLength) EndScroll()", >+ "*volume_bar.translations: #override\\n"\ >+ "~Ctrl Shift<Btn1Down>: do-volupdown(-50)\\n"\ >+ "~Ctrl Shift<Btn3Down>: do-volupdown(50)\\n"\ >+ "Ctrl ~Shift<Btn1Down>: do-volupdown(-5)\\n"\ >+ "Ctrl ~Shift<Btn3Down>: do-volupdown(5)\\n"\ >+ "<Btn1Down>: MoveThumb()\\n"\ >+ "<BtnUp>: NotifyScroll(FullLength) EndScroll()", >+ "*tune_bar.translations: #override\\n"\ >+ "<Btn1Up>: do-tuneset()\\n"\ >+ "<Btn3Up>: do-tuneslide()\\n"\ >+ "<Btn1Down>: MoveThumb()\\n"\ >+ "<BtnUp>: NotifyScroll(FullLength) EndScroll()", > #else >- "*volume_bar.translations: #override\\n\ >- ~Ctrl Shift<Btn1Down>: do-volupdown(-50)\\n\ >- ~Ctrl Shift<Btn3Down>: do-volupdown(50)\\n\ >- Ctrl ~Shift<Btn1Down>: do-volupdown(-5)\\n\ >- Ctrl ~Shift<Btn3Down>: do-volupdown(5)\\n\ >- <Btn1Down>: StartScroll(Forward) MoveThumb()\\n\ >- <Btn3Down>: StartScroll(Backward) MoveThumb()\\n\ >- <BtnUp>: NotifyScroll(FullLength) EndScroll()", >- "*tune_bar.translations: #override\\n\ >- <Btn1Up>: do-tuneset()\\n\ >- <Btn3Up>: do-tuneslide()\\n\ >- <Btn1Down>: StartScroll(Forward) MoveThumb()\\n\ >- <Btn3Down>: StartScroll(Backward) MoveThumb()\\n\ >- <BtnUp>: NotifyScroll(FullLength) EndScroll()", >+ "*volume_bar.translations: #override\\n"\ >+ "~Ctrl Shift<Btn1Down>: do-volupdown(-50)\\n"\ >+ "~Ctrl Shift<Btn3Down>: do-volupdown(50)\\n"\ >+ "Ctrl ~Shift<Btn1Down>: do-volupdown(-5)\\n"\ >+ "Ctrl ~Shift<Btn3Down>: do-volupdown(5)\\n"\ >+ "<Btn1Down>: StartScroll(Forward) MoveThumb()\\n"\ >+ "<Btn3Down>: StartScroll(Backward) MoveThumb()\\n"\ >+ "<BtnUp>: NotifyScroll(FullLength) EndScroll()", >+ "*tune_bar.translations: #override\\n"\ >+ "<Btn1Up>: do-tuneset()\\n"\ >+ "<Btn3Up>: do-tuneslide()\\n"\ >+ "<Btn1Down>: StartScroll(Forward) MoveThumb()\\n"\ >+ "<Btn3Down>: StartScroll(Backward) MoveThumb()\\n"\ >+ "<BtnUp>: NotifyScroll(FullLength) EndScroll()", > #endif > "*file_simplemenu.load.label: Load (Meta-N)", > "*file_simplemenu.saveconfig.label: Save Config (Meta-S)", >@@ -3285,92 +3285,92 @@ > "*chpressure_box.chpressure_lbl.label: Channel Pressure control", > "*overlapvoice_box.overlapv_lbl.label: Allow Multiple Same Notes", > "*txtmeta_box.txtmeta_lbl.label: Tracing All Text Meta Events", >- "*base_form.translations: #override\\n\ >- ~Ctrl Meta<Key>n: do-load()\\n\ >- ~Ctrl Meta<Key>s: do-menu(" IDS_SAVECONFIG ")\\n\ >- Ctrl <Key>r: do-menu(" IDS_REPEAT ")\\n\ >- Ctrl <Key>s: do-menu(" IDS_SHUFFLE ")\\n\ >- Ctrl<Key>t: do-menu(" IDS_HIDETRACE ")\\n\ >- Ctrl<Key>m: do-menu(" IDS_HIDETXT ")\\n\ >- ~Ctrl<Key>q: do-quit()\\n\ >- ~Ctrl<Key>r: do-play()\\n\ >- <Key>Return: do-play()\\n\ >- <Key>KP_Enter: do-play()\\n\ >- ~Ctrl<Key>g: do-sndspec()\\n\ >- ~Ctrl<Key>space: do-pause()\\n\ >- ~Ctrl<Key>s: do-stop()\\n\ >- <Key>p: do-prev()\\n\ >- <Key>Left: do-prev()\\n\ >- ~Meta<Key>n: do-next()\\n\ >- <Key>Right: do-next()\\n\ >- ~Ctrl<Key>f: do-forward()\\n\ >- ~Ctrl<Key>b: do-back()\\n\ >- ~Ctrl<Key>plus: do-key()\\n\ >- ~Shift<Key>-: do-key(1)\\n\ >- <Key>KP_Add: do-key()\\n\ >- <Key>KP_Subtract: do-key(1)\\n\ >- ~Ctrl<Key>greater: do-speed()\\n\ >- ~Ctrl<Key>less: do-speed(1)\\n\ >- ~Ctrl ~Shift<Key>o: do-voice()\\n\ >- ~Ctrl Shift<Key>o: do-voice(1)\\n\ >- Ctrl<Key>o: do-options()\\n\ >- Ctrl<Key>f: do-filelist()\\n\ >- <Key>l: do-filelist()\\n\ >- <Key>a: do-about()\\n\ >- ~Ctrl ~Shift<Key>v: do-volupdown(-10)\\n\ >- ~Ctrl Shift<Key>v: do-volupdown(10)\\n\ >- <Key>Down: do-volupdown(-10)\\n\ >- <Key>Up: do-volupdown(10)\\n\ >- ~Ctrl<Key>x: do-exchange()\\n\ >- ~Ctrl<Key>t: do-toggletrace()\\n\ >- <ConfigureNotify>: do-resize()", >- >- "*load_dialog.value.translations: #override\\n\ >- ~Ctrl<Key>Return: do-chgdir() end-of-line()\\n\ >- ~Ctrl<Key>KP_Enter: do-chgdir() end-of-line()\\n\ >- ~Ctrl ~Meta<Key>Tab: do-complete() end-of-line()\\n\ >- Ctrl ~Shift<Key>g: do-dialog-button(1)\\n\ >- <Key>BackSpace: do-backspace() delete-previous-character()\\n\ >- <Key>Delete: do-backspace() delete-previous-character()\\n\ >- Ctrl<Key>H: do-backspace() delete-previous-character()\\n\ >- <Key>Escape: do-dialog-button(1)", >- "*trace.translations: #override\\n\ >- <Btn1Down>: do-toggletrace()\\n\ >- <EnterNotify>: do-revcaption()\\n\ >- <LeaveNotify>: do-revcaption()\\n\ >- <Expose>: draw-trace()", >- "*time_label.translations: #override\\n\ >- <Btn2Down>: do-menu(" IDS_HIDETRACE ")\\n\ >- <Btn3Down>: do-exchange()", >- "*popup_optbox.translations: #override\\n\ >- ~Ctrl<Key>c: do-closeparent()\\n\ >- ~Ctrl<Key>q: do-quit()", >- "*popup_fbox.translations: #override\\n\ >- ~Ctrl<Key>c: do-closeparent()\\n\ >- <Key>Up: do-flistmove(-1)\\n\ >- <Key>p: do-flistmove(-1)\\n\ >- <Key>Prior: do-flistmove(-5)\\n\ >- <Key>Right: do-flistmove(-5)\\n\ >- ~Ctrl<Key>r: do-fselect()\\n\ >- <Key>Return: do-fselect()\\n\ >- <Key>KP_Enter: do-fselect()\\n\ >- Ctrl<Key>m: do-fselect()\\n\ >- <Key>space: do-pause()\\n\ >- <Key>s: do-stop()\\n\ >- <Key>Down: do-flistmove(1)\\n\ >- <Key>n: do-flistmove(1)\\n\ >- <Key>Next: do-flistmove(5)\\n\ >- <Key>Left: do-flistmove(5)\\n\ >- <Key>d: do-fdelete()\\n\ >- ~Shift<Key>v: do-volupdown(-10)\\n\ >- Shift<Key>v: do-volupdown(10)\\n\ >- ~Ctrl<Key>f: do-forward()\\n\ >- ~Ctrl<Key>b: do-back()\\n\ >- ~Ctrl<Key>q: do-quit()", >- "*popup_abox.translations: #override\\n\ >- ~Ctrl<Key>c: do-closeparent()\\n\ >- <Key>KP_Enter: do-closeparent()\\n\ >- <Key>Return: do-closeparent()", >+ "*base_form.translations: #override\\n"\ >+ "~Ctrl Meta<Key>n: do-load()\\n"\ >+ "~Ctrl Meta<Key>s: do-menu(" IDS_SAVECONFIG ")\\n"\ >+ "Ctrl <Key>r: do-menu(" IDS_REPEAT ")\\n"\ >+ "Ctrl <Key>s: do-menu(" IDS_SHUFFLE ")\\n"\ >+ "Ctrl<Key>t: do-menu(" IDS_HIDETRACE ")\\n"\ >+ "Ctrl<Key>m: do-menu(" IDS_HIDETXT ")\\n"\ >+ "~Ctrl<Key>q: do-quit()\\n"\ >+ "~Ctrl<Key>r: do-play()\\n"\ >+ "<Key>Return: do-play()\\n"\ >+ "<Key>KP_Enter: do-play()\\n"\ >+ "~Ctrl<Key>g: do-sndspec()\\n"\ >+ "~Ctrl<Key>space: do-pause()\\n"\ >+ "~Ctrl<Key>s: do-stop()\\n"\ >+ "<Key>p: do-prev()\\n"\ >+ "<Key>Left: do-prev()\\n"\ >+ "~Meta<Key>n: do-next()\\n"\ >+ "<Key>Right: do-next()\\n"\ >+ "~Ctrl<Key>f: do-forward()\\n"\ >+ "~Ctrl<Key>b: do-back()\\n"\ >+ "~Ctrl<Key>plus: do-key()\\n"\ >+ "~Shift<Key>-: do-key(1)\\n"\ >+ "<Key>KP_Add: do-key()\\n"\ >+ "<Key>KP_Subtract: do-key(1)\\n"\ >+ "~Ctrl<Key>greater: do-speed()\\n"\ >+ "~Ctrl<Key>less: do-speed(1)\\n"\ >+ "~Ctrl ~Shift<Key>o: do-voice()\\n"\ >+ "~Ctrl Shift<Key>o: do-voice(1)\\n"\ >+ "Ctrl<Key>o: do-options()\\n"\ >+ "Ctrl<Key>f: do-filelist()\\n"\ >+ "<Key>l: do-filelist()\\n"\ >+ "<Key>a: do-about()\\n"\ >+ "~Ctrl ~Shift<Key>v: do-volupdown(-10)\\n"\ >+ "~Ctrl Shift<Key>v: do-volupdown(10)\\n"\ >+ "<Key>Down: do-volupdown(-10)\\n"\ >+ "<Key>Up: do-volupdown(10)\\n"\ >+ "~Ctrl<Key>x: do-exchange()\\n"\ >+ "~Ctrl<Key>t: do-toggletrace()\\n"\ >+ "<ConfigureNotify>: do-resize()", >+ >+ "*load_dialog.value.translations: #override\\n"\ >+ "~Ctrl<Key>Return: do-chgdir() end-of-line()\\n"\ >+ "~Ctrl<Key>KP_Enter: do-chgdir() end-of-line()\\n"\ >+ "~Ctrl ~Meta<Key>Tab: do-complete() end-of-line()\\n"\ >+ "Ctrl ~Shift<Key>g: do-dialog-button(1)\\n"\ >+ "<Key>BackSpace: do-backspace() delete-previous-character()\\n"\ >+ "<Key>Delete: do-backspace() delete-previous-character()\\n"\ >+ "Ctrl<Key>H: do-backspace() delete-previous-character()\\n"\ >+ "<Key>Escape: do-dialog-button(1)", >+ "*trace.translations: #override\\n"\ >+ "<Btn1Down>: do-toggletrace()\\n"\ >+ "<EnterNotify>: do-revcaption()\\n"\ >+ "<LeaveNotify>: do-revcaption()\\n"\ >+ "<Expose>: draw-trace()", >+ "*time_label.translations: #override\\n"\ >+ "<Btn2Down>: do-menu(" IDS_HIDETRACE ")\\n"\ >+ "<Btn3Down>: do-exchange()", >+ "*popup_optbox.translations: #override\\n"\ >+ "~Ctrl<Key>c: do-closeparent()\\n"\ >+ "~Ctrl<Key>q: do-quit()", >+ "*popup_fbox.translations: #override\\n"\ >+ "~Ctrl<Key>c: do-closeparent()\\n"\ >+ "<Key>Up: do-flistmove(-1)\\n"\ >+ "<Key>p: do-flistmove(-1)\\n"\ >+ "<Key>Prior: do-flistmove(-5)\\n"\ >+ "<Key>Right: do-flistmove(-5)\\n"\ >+ "~Ctrl<Key>r: do-fselect()\\n"\ >+ "<Key>Return: do-fselect()\\n"\ >+ "<Key>KP_Enter: do-fselect()\\n"\ >+ "Ctrl<Key>m: do-fselect()\\n"\ >+ "<Key>space: do-pause()\\n"\ >+ "<Key>s: do-stop()\\n"\ >+ "<Key>Down: do-flistmove(1)\\n"\ >+ "<Key>n: do-flistmove(1)\\n"\ >+ "<Key>Next: do-flistmove(5)\\n"\ >+ "<Key>Left: do-flistmove(5)\\n"\ >+ "<Key>d: do-fdelete()\\n"\ >+ "~Shift<Key>v: do-volupdown(-10)\\n"\ >+ "Shift<Key>v: do-volupdown(10)\\n"\ >+ "~Ctrl<Key>f: do-forward()\\n"\ >+ "~Ctrl<Key>b: do-back()\\n"\ >+ "~Ctrl<Key>q: do-quit()", >+ "*popup_abox.translations: #override\\n"\ >+ "~Ctrl<Key>c: do-closeparent()\\n"\ >+ "<Key>KP_Enter: do-closeparent()\\n"\ >+ "<Key>Return: do-closeparent()", > NULL, > }; > XtAppContext app_con; >diff -ur krec/main.cpp krec/main.cpp >--- krec/main.cpp 2002-09-07 02:12:08.000000000 +0200 >+++ krec/main.cpp 2003-10-03 20:35:49.000000000 +0200 >@@ -30,11 +30,11 @@ > using namespace std; > > static const char *description = >- I18N_NOOP("Description for KRec.\n\n\ >-This is a recording tool for KDE.\n\ >-It uses aRts, just look at the audiomanager\n\ >-and you will find it there accepting sound\n\ >-for recording." >+ I18N_NOOP("Description for KRec.\n\n"\ >+"This is a recording tool for KDE.\n"\ >+"It uses aRts, just look at the audiomanager\n"\ >+"and you will find it there accepting sound\n"\ >+"for recording." > ); > > static KCmdLineOptions options[] = >diff -ur mpeglib/lib/tplay/au.cpp mpeglib/lib/tplay/au.cpp >--- mpeglib/lib/tplay/au.cpp 2000-07-04 21:22:46.000000000 +0200 >+++ mpeglib/lib/tplay/au.cpp 2003-10-03 22:45:10.924746440 +0200 >@@ -31,8 +31,8 @@ > channels = read_big_endian_long(buffer + 0x14); > > #ifdef DEBUG >- printf("Sun audio file.\nspeed: %ld, start: %ld, end: %ld, \ >-encoding: %X, channels: %ld\n", >+ printf("Sun audio file.\nspeed: %ld, start: %ld, end: %ld, "\ >+"encoding: %X, channels: %ld\n", > speed, start, end, encoding, channels); > fflush(stdout); > #endif >@@ -61,8 +61,8 @@ > die("64-bit IEEE floating point Sun audio file not supported"); > break; > case 23: >- die("8-bit ISDN u-law compressed(G.721 ADPCM) Sun audio file \ >-not supported"); >+ die("8-bit ISDN u-law compressed(G.721 ADPCM) Sun audio file "\ >+"not supported"); > break; > default: > errdie("Unknown Sun audio file");
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=18694">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 30269
:
18693
| 18694
