From 911d4c0f832abdd63fe87253962463f91a3803a1f0a7c901616097ce87467898 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 3 Feb 2020 09:50:34 +0000 Subject: [PATCH] Accepting request 769492 from home:plater - Download 2.3.3 tarball again to fix incorrect release info. - Use autopatch and refresh patches. - Fix boo#1162418, caused by wxWidgets. OBS-URL: https://build.opensuse.org/request/show/769492 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=136 --- Audacity-2.3.3.tar.gz | 4 ++-- audacity-flacversion.patch | 6 +++--- audacity-misc-errors.patch | 12 ++++++------ audacity-no_buildstamp.patch | 12 ++++++------ audacity-no_return_in_nonvoid.patch | 14 +++++++------- audacity.changes | 7 +++++++ audacity.spec | 7 ++----- 7 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Audacity-2.3.3.tar.gz b/Audacity-2.3.3.tar.gz index 676ceb3..cdf89a4 100644 --- a/Audacity-2.3.3.tar.gz +++ b/Audacity-2.3.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ab6c8989e21165b86aad80b7e6691015cb5b0c91ab77e6170d7192f840313a8 -size 62099027 +oid sha256:404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7 +size 62073352 diff --git a/audacity-flacversion.patch b/audacity-flacversion.patch index da05ce7..2c0b8a6 100644 --- a/audacity-flacversion.patch +++ b/audacity-flacversion.patch @@ -1,7 +1,7 @@ -Index: m4/audacity_checklib_libflac.m4 +Index: audacity-Audacity-2.3.3/m4/audacity_checklib_libflac.m4 =================================================================== ---- m4/audacity_checklib_libflac.m4.orig 2017-03-13 23:02:21.000000000 +0200 -+++ m4/audacity_checklib_libflac.m4 2017-03-18 18:39:01.009659215 +0200 +--- audacity-Audacity-2.3.3.orig/m4/audacity_checklib_libflac.m4 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/m4/audacity_checklib_libflac.m4 2020-02-02 15:41:14.847457491 +0200 @@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ dnl See if FLAC is installed in the system diff --git a/audacity-misc-errors.patch b/audacity-misc-errors.patch index 5402797..1618efc 100644 --- a/audacity-misc-errors.patch +++ b/audacity-misc-errors.patch @@ -23,10 +23,10 @@ I: Program uses operation a <= b <= c, which is not well defined. E: audacity mathmeaning SplashDialog.cpp:148 -Index: lib-src/portmidi/pm_linux/finddefault.c +Index: audacity-Audacity-2.3.3/lib-src/portmidi/pm_linux/finddefault.c =================================================================== ---- lib-src/portmidi/pm_linux/finddefault.c.orig 2018-10-01 08:28:57.297126154 +0200 -+++ lib-src/portmidi/pm_linux/finddefault.c 2018-10-01 08:35:55.991702808 +0200 +--- audacity-Audacity-2.3.3.orig/lib-src/portmidi/pm_linux/finddefault.c 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/lib-src/portmidi/pm_linux/finddefault.c 2020-02-02 15:41:26.235929851 +0200 @@ -5,6 +5,8 @@ #include #include @@ -36,10 +36,10 @@ Index: lib-src/portmidi/pm_linux/finddefault.c #include "portmidi.h" #define STRING_MAX 256 -Index: include/audacity/EffectAutomationParameters.h +Index: audacity-Audacity-2.3.3/include/audacity/EffectAutomationParameters.h =================================================================== ---- include/audacity/EffectAutomationParameters.h.orig 2018-10-01 08:28:57.297126154 +0200 -+++ include/audacity/EffectAutomationParameters.h 2018-10-01 08:35:55.995702976 +0200 +--- audacity-Audacity-2.3.3.orig/include/audacity/EffectAutomationParameters.h 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/include/audacity/EffectAutomationParameters.h 2020-02-02 15:41:26.235929851 +0200 @@ -135,7 +135,7 @@ public: bool ReadFloat(const wxString & key, float *pf) const diff --git a/audacity-no_buildstamp.patch b/audacity-no_buildstamp.patch index 9340207..a158e6f 100644 --- a/audacity-no_buildstamp.patch +++ b/audacity-no_buildstamp.patch @@ -1,7 +1,7 @@ -Index: src/AboutDialog.cpp +Index: audacity-Audacity-2.3.3/src/AboutDialog.cpp =================================================================== ---- src/AboutDialog.cpp.orig 2019-11-15 01:28:15.000000000 +0200 -+++ src/AboutDialog.cpp 2019-11-25 12:08:49.331580095 +0200 +--- audacity-Audacity-2.3.3.orig/src/AboutDialog.cpp 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/src/AboutDialog.cpp 2020-02-02 15:40:57.718746982 +0200 @@ -65,7 +65,7 @@ hold information about one contributor t #ifdef REV_LONG #define REV_IDENT wxString( "[[https://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME @@ -22,10 +22,10 @@ Index: src/AboutDialog.cpp AddBuildinfoRow(&informationStr, _("Commit Id:"), REV_IDENT ); // Not translated in 2.3.1. -Index: lib-src/portaudio-v19/qa/loopback/src/paqa.c +Index: audacity-Audacity-2.3.3/lib-src/portaudio-v19/qa/loopback/src/paqa.c =================================================================== ---- lib-src/portaudio-v19/qa/loopback/src/paqa.c.orig 2019-11-15 01:28:15.000000000 +0200 -+++ lib-src/portaudio-v19/qa/loopback/src/paqa.c 2019-11-25 11:46:54.896516478 +0200 +--- audacity-Audacity-2.3.3.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2020-02-02 15:40:57.718746982 +0200 @@ -1460,7 +1460,7 @@ int main( int argc, char **argv ) int justMath = 0; char *executableName = argv[0]; diff --git a/audacity-no_return_in_nonvoid.patch b/audacity-no_return_in_nonvoid.patch index 4442d58..ebdf0f5 100644 --- a/audacity-no_return_in_nonvoid.patch +++ b/audacity-no_return_in_nonvoid.patch @@ -1,8 +1,8 @@ -Index: src/widgets/NumericTextCtrl.cpp +Index: audacity-Audacity-2.3.3/src/widgets/NumericTextCtrl.cpp =================================================================== ---- src/widgets/NumericTextCtrl.cpp.orig 2018-09-20 16:35:07.000000000 +0200 -+++ src/widgets/NumericTextCtrl.cpp 2018-10-02 15:40:50.555227216 +0200 -@@ -551,6 +551,7 @@ static const BuiltinFormatString Bandwid +--- audacity-Audacity-2.3.3.orig/src/widgets/NumericTextCtrl.cpp 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/src/widgets/NumericTextCtrl.cpp 2020-02-02 15:41:21.663740215 +0200 +@@ -637,6 +637,7 @@ static const BuiltinFormatString Bandwid case NumericConverter::BANDWIDTH: return WXSIZEOF(BandwidthConverterFormats_); } @@ -10,10 +10,10 @@ Index: src/widgets/NumericTextCtrl.cpp } } -Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c +Index: audacity-Audacity-2.3.3/lib-src/libnyquist/nyquist/xlisp/xlbfun.c =================================================================== ---- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig 2018-09-20 16:35:07.000000000 +0200 -+++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2018-10-02 15:35:59.076781229 +0200 +--- audacity-Audacity-2.3.3.orig/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2019-11-15 13:14:55.000000000 +0200 ++++ audacity-Audacity-2.3.3/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2020-02-02 15:41:21.663740215 +0200 @@ -603,7 +603,10 @@ LVAL xcleanup(void) { xllastarg(); diff --git a/audacity.changes b/audacity.changes index d1bee66..d1ed5ee 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 3 07:34:28 UTC 2020 - Dave Plater + +- Download 2.3.3 tarball again to fix incorrect release info. +- Use autopatch and refresh patches. +- Fix boo#1162418, caused by wxWidgets. + ------------------------------------------------------------------- Mon Nov 25 09:27:45 UTC 2019 - Dave Plater diff --git a/audacity.spec b/audacity.spec index 9db19e2..4405dcc 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,7 +1,7 @@ # # spec file for package audacity # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -102,10 +102,7 @@ physical memory size can be edited. %prep %setup -q -n %{name}-Audacity-%{version} -%patch0 -%patch1 -p0 -%patch3 -p0 -%patch2 +%autopatch -p1 cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions.