Accepting request 38104 from multimedia:apps

checked in (request 38104)

OBS-URL: https://build.opensuse.org/request/show/38104
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=39
This commit is contained in:
OBS User autobuild 2010-04-18 22:23:30 +00:00 committed by Git OBS Bridge
parent 5b2b444c18
commit 96158a4c57
4 changed files with 12 additions and 34 deletions

View File

@ -1,8 +1,8 @@
Index: audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp Index: audacity-src-1.3.9/src/prefs/DevicePrefs.cpp
=================================================================== ===================================================================
--- audacity-src-1.3.12-beta.orig/src/prefs/DevicePrefs.cpp --- audacity-src-1.3.9.orig/src/prefs/DevicePrefs.cpp
+++ audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp +++ audacity-src-1.3.9/src/prefs/DevicePrefs.cpp
@@ -193,6 +193,16 @@ void DevicePrefs::OnHost(wxCommandEvent @@ -173,6 +173,16 @@ void DevicePrefs::OnHost(wxCommandEvent
wxArrayString playnames; wxArrayString playnames;
wxArrayString recordnames; wxArrayString recordnames;
@ -19,7 +19,7 @@ Index: audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp
int devindex; /* temp variable to hold the numeric ID of each device in turn */ int devindex; /* temp variable to hold the numeric ID of each device in turn */
for (int i = 0; i < nDevices; i++) { for (int i = 0; i < nDevices; i++) {
@@ -205,7 +215,10 @@ void DevicePrefs::OnHost(wxCommandEvent @@ -185,7 +195,10 @@ void DevicePrefs::OnHost(wxCommandEvent
if (info->maxOutputChannels > 0) { if (info->maxOutputChannels > 0) {
playnames.Add(name); playnames.Add(name);
devindex = mPlay->Append(name, (void *) info); devindex = mPlay->Append(name, (void *) info);
@ -31,7 +31,7 @@ Index: audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp
mPlay->SetSelection(devindex); mPlay->SetSelection(devindex);
} }
} }
@@ -213,7 +226,10 @@ void DevicePrefs::OnHost(wxCommandEvent @@ -193,7 +206,10 @@ void DevicePrefs::OnHost(wxCommandEvent
if (info->maxInputChannels > 0) { if (info->maxInputChannels > 0) {
recordnames.Add(name); recordnames.Add(name);
devindex = mRecord->Append(name, (void *) info); devindex = mRecord->Append(name, (void *) info);

View File

@ -11,16 +11,3 @@ Index: lib-src/portaudio-v19/src/common/pa_front.c
Index: src/AboutDialog.cpp
===================================================================
--- src/AboutDialog.cpp.orig
+++ src/AboutDialog.cpp
@@ -489,7 +489,7 @@ void AboutDialog::PopulateInformationPag
informationStr += wxT("</h3>\n<table>");
// Current date
- AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
+ //AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
#ifdef __WXDEBUG__
AddBuildinfoRow(&informationStr, _("Build type:"), _("Debug build"));

View File

@ -1,8 +1,6 @@
Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c --- lib-src/libnyquist/nyquist/xlisp/xlbfun.c
===================================================================
--- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig
+++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c +++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c
@@ -603,6 +603,7 @@ LVAL xcleanup(void) @@ -603,6 +603,7 @@
{ {
xllastarg(); xllastarg();
xlcleanup(); xlcleanup();
@ -10,7 +8,7 @@ Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c
} }
/* xtoplevel - special form 'top-level' */ /* xtoplevel - special form 'top-level' */
@@ -610,6 +611,7 @@ LVAL xtoplevel(void) @@ -610,6 +611,7 @@
{ {
xllastarg(); xllastarg();
xltoplevel(); xltoplevel();
@ -18,7 +16,7 @@ Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c
} }
/* xcontinue - special form 'continue' */ /* xcontinue - special form 'continue' */
@@ -617,6 +619,7 @@ LVAL xcontinue(void) @@ -617,6 +619,7 @@
{ {
xllastarg(); xllastarg();
xlcontinue(); xlcontinue();
@ -26,11 +24,9 @@ Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c
} }
/* xevalhook - eval hook function */ /* xevalhook - eval hook function */
Index: lib-src/libnyquist/nyquist/xlisp/xlread.c --- lib-src/libnyquist/nyquist/xlisp/xlread.c
===================================================================
--- lib-src/libnyquist/nyquist/xlisp/xlread.c.orig
+++ lib-src/libnyquist/nyquist/xlisp/xlread.c +++ lib-src/libnyquist/nyquist/xlisp/xlread.c
@@ -335,6 +335,8 @@ int readone(LVAL fptr, LVAL *pval) @@ -240,6 +240,8 @@
/* handle illegal characters */ /* handle illegal characters */
else else
xlerror("illegal character",cvfixnum((FIXTYPE)ch)); xlerror("illegal character",cvfixnum((FIXTYPE)ch));

View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Sat Apr 17 15:00:02 UTC 2010 - cmorve69@yahoo.es
- Updated no_buildstamp patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 13 08:43:47 UTC 2010 - davejplater@gmail.com Tue Apr 13 08:43:47 UTC 2010 - davejplater@gmail.com