From 67cdf00d6d2c3e9470f3df0d1837782769cb357da228d3dd95f1a7cf665ec09c Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 22 Feb 2018 12:28:13 +0000 Subject: [PATCH 1/2] Accepting request 578998 from home:plater - Update to release version 2.2.2. - Rebase audacity-no_buildstamp.patch. - Removed incorporated audacity-fix-nonsense.patch. - Added audacity-misc-errors.patch to fix various errors picked up by rpmlint. - Added to audacity-no_return_in_nonvoid.patch. - Upstream changes: *Easier zooming in and out with mousewheel, new Zoom Toggle command, and context menu for vertical rulers. *Easy access to change keyboard bindings of menu commands by holding Shift key. *Detection of dropout errors while recording with overburdened CPU. *Improved contrasts in Light and Dark themes *Half-wave display option *Several bugs/annoyances in 2.2.1 are now fixed OBS-URL: https://build.opensuse.org/request/show/578998 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=119 --- Audacity-2.2.1.tar.gz | 3 -- Audacity-2.2.2.tar.gz | 3 ++ audacity-fix-nonsense.patch | 28 ------------ audacity-misc-errors.patch | 66 +++++++++++++++++++++++++++++ audacity-no_buildstamp.patch | 14 +++--- audacity-no_return_in_nonvoid.patch | 24 +++++++++-- audacity.changes | 20 +++++++++ audacity.spec | 21 +++++---- 8 files changed, 126 insertions(+), 53 deletions(-) delete mode 100644 Audacity-2.2.1.tar.gz create mode 100644 Audacity-2.2.2.tar.gz delete mode 100644 audacity-fix-nonsense.patch create mode 100644 audacity-misc-errors.patch diff --git a/Audacity-2.2.1.tar.gz b/Audacity-2.2.1.tar.gz deleted file mode 100644 index b229f5b..0000000 --- a/Audacity-2.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff346e7a68a57a05089813efd78a81439f5419d211f80bb472c9d94c16ca05d8 -size 24597030 diff --git a/Audacity-2.2.2.tar.gz b/Audacity-2.2.2.tar.gz new file mode 100644 index 0000000..54a4c99 --- /dev/null +++ b/Audacity-2.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3 +size 25947462 diff --git a/audacity-fix-nonsense.patch b/audacity-fix-nonsense.patch deleted file mode 100644 index baa9d14..0000000 --- a/audacity-fix-nonsense.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c -=================================================================== ---- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig 2017-03-03 21:27:17.000000000 +0200 -+++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2017-03-12 10:16:53.207654852 +0200 -@@ -603,7 +603,10 @@ LVAL xcleanup(void) - { - xllastarg(); - xlcleanup(); -- /* compiler might (wrongly) complain there is no return value */ -+ /* this point will never be reached because xlcleanup() does a -+ longjmp(). The return is added to avoid false positive -+ error messages from static analyzers and compilers */ -+ return (NIL); - } - - /* xtoplevel - special form 'top-level' */ -Index: src/PluginManager.h -=================================================================== ---- src/PluginManager.h.orig 2017-03-03 21:27:17.000000000 +0200 -+++ src/PluginManager.h 2017-03-12 10:16:53.207654852 +0200 -@@ -167,7 +167,6 @@ typedef std::map +Date: Thu 22 Feb 12:11:43 SAST 2018 +Subject: Fix various build errors found by rpmlint +References: +Upstream: reported to audacity devel list. + +I: Program is using implicit definitions of functions getting + pointers or implemented by macros. These functions need to use their + correct prototypes to allow correct argument passing on e.g. x86_64 . + - Implicit memory/string functions need #include . + - Implicit *printf functions need #include . + - Implicit *printf functions need #include . + - Implicit *read* functions need #include . + - Implicit *recv* functions need #include . +W: audacity implicit-pointer-decl pm_linux/finddefault.c:16 + +I: Program is using uninitialized variables. + Note the difference between "is used" and "may be used" +W: audacity uninitialized-variable ../include/audacity/EffectAutomationParameters.h:122 +W: audacity uninitialized-variable sse.h:19 + +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 +=================================================================== +--- lib-src/portmidi/pm_linux/finddefault.c.orig 2018-02-14 09:11:20.000000000 +0200 ++++ lib-src/portmidi/pm_linux/finddefault.c 2018-02-22 13:22:36.862525944 +0200 +@@ -5,6 +5,8 @@ + #include + #include + #include ++#include ++#include + #include "portmidi.h" + + #define STRING_MAX 256 +Index: src/SplashDialog.cpp +=================================================================== +--- src/SplashDialog.cpp.orig 2018-02-14 09:11:20.000000000 +0200 ++++ src/SplashDialog.cpp 2018-02-22 13:22:36.870526246 +0200 +@@ -114,7 +114,9 @@ void SplashDialog::Populate( ShuttleGui + S.Prop(0).AddWindow( icon ); + + icon +-#if ((((AUDACITY_VERSION % 10) ^ 1) >> 1) == 1) ++/* #if ((((AUDACITY_VERSION % 10) ^ 1) >> 1) == 1) */ ++#if 1 == 0 ++ + ->Bind(wxEVT_LEFT_DOWN + + ,[this]( +Index: include/audacity/EffectAutomationParameters.h +=================================================================== +--- include/audacity/EffectAutomationParameters.h.orig 2018-02-14 09:11:20.000000000 +0200 ++++ include/audacity/EffectAutomationParameters.h 2018-02-22 13:32:46.233388822 +0200 +@@ -119,7 +119,7 @@ public: + + bool ReadFloat(const wxString & key, float *pf) const + { +- double d = *pf; ++ double d = (float) *pf; + bool success = Read(key, &d); + if (success) + { diff --git a/audacity-no_buildstamp.patch b/audacity-no_buildstamp.patch index fe18427..59f6018 100644 --- a/audacity-no_buildstamp.patch +++ b/audacity-no_buildstamp.patch @@ -1,17 +1,17 @@ Index: src/AboutDialog.cpp =================================================================== ---- src/AboutDialog.cpp.orig 2017-03-13 23:02:21.000000000 +0200 -+++ src/AboutDialog.cpp 2017-03-18 16:42:02.355788390 +0200 -@@ -59,7 +59,7 @@ hold information about one contributor t +--- src/AboutDialog.cpp.orig 2018-02-14 09:11:20.000000000 +0200 ++++ src/AboutDialog.cpp 2018-02-22 11:19:34.839783711 +0200 +@@ -64,7 +64,7 @@ hold information about one contributor t #ifdef REV_LONG - #define REV_IDENT wxString( "[[http://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME + #define REV_IDENT wxString( "[[https://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME #else -#define REV_IDENT wxT("No revision identifier was provided") +#define REV_IDENT wxT("Official openSUSE Build") #endif extern wxString FormatHtmlText( const wxString & Text ); -@@ -70,7 +70,7 @@ const wxString VerCheckArgs(){ +@@ -75,7 +75,7 @@ const wxString VerCheckArgs(){ #ifdef REV_LONG result += wxString("&CommitId=")+wxString(REV_LONG).Left(6); #endif @@ -22,8 +22,8 @@ Index: src/AboutDialog.cpp } Index: lib-src/portaudio-v19/qa/loopback/src/paqa.c =================================================================== ---- lib-src/portaudio-v19/qa/loopback/src/paqa.c.orig 2017-03-13 23:02:21.000000000 +0200 -+++ lib-src/portaudio-v19/qa/loopback/src/paqa.c 2017-03-18 15:32:00.553429177 +0200 +--- lib-src/portaudio-v19/qa/loopback/src/paqa.c.orig 2018-02-14 09:11:20.000000000 +0200 ++++ lib-src/portaudio-v19/qa/loopback/src/paqa.c 2018-02-22 11:19:34.839783711 +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 ebe6835..4c5fe34 100644 --- a/audacity-no_return_in_nonvoid.patch +++ b/audacity-no_return_in_nonvoid.patch @@ -1,8 +1,8 @@ -Index: audacity-Audacity-2.2.0/src/widgets/NumericTextCtrl.cpp +Index: src/widgets/NumericTextCtrl.cpp =================================================================== ---- audacity-Audacity-2.2.0.orig/src/widgets/NumericTextCtrl.cpp -+++ audacity-Audacity-2.2.0/src/widgets/NumericTextCtrl.cpp -@@ -603,6 +603,7 @@ return theArray.Get(); +--- src/widgets/NumericTextCtrl.cpp.orig 2018-02-14 09:11:20.000000000 +0200 ++++ src/widgets/NumericTextCtrl.cpp 2018-02-22 11:55:52.378391120 +0200 +@@ -604,6 +604,7 @@ return theArray.Get(); case NumericConverter::BANDWIDTH: return BandwidthConverterFormats(); } @@ -10,3 +10,19 @@ Index: audacity-Audacity-2.2.0/src/widgets/NumericTextCtrl.cpp } } +Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c +=================================================================== +--- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig 2018-02-14 09:11:20.000000000 +0200 ++++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2018-02-22 12:03:14.405777878 +0200 +@@ -603,7 +603,10 @@ LVAL xcleanup(void) + { + xllastarg(); + xlcleanup(); +- /* compiler might (wrongly) complain there is no return value */ ++ /* this point will never be reached because xlcleanup() does a ++ longjmp(). The return is added to avoid false positive ++ error messages from static analyzers and compilers */ ++ return (NIL); + } + + /* xtoplevel - special form 'top-level' */ diff --git a/audacity.changes b/audacity.changes index bd33aa0..c847dae 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Feb 22 09:54:45 UTC 2018 - davejplater@gmail.com + +- Update to release version 2.2.2. +- Rebase audacity-no_buildstamp.patch. +- Removed incorporated audacity-fix-nonsense.patch. +- Added audacity-misc-errors.patch to fix various errors picked + up by rpmlint. +- Added to audacity-no_return_in_nonvoid.patch. +- Upstream changes: + *Easier zooming in and out with mousewheel, new Zoom Toggle + command, and context menu for vertical rulers. + *Easy access to change keyboard bindings of menu commands + by holding Shift key. + *Detection of dropout errors while recording with + overburdened CPU. + *Improved contrasts in Light and Dark themes + *Half-wave display option + *Several bugs/annoyances in 2.2.1 are now fixed + ------------------------------------------------------------------- Fri Jan 26 09:23:34 UTC 2018 - davejplater@gmail.com diff --git a/audacity.spec b/audacity.spec index 71e9f4d..a549581 100644 --- a/audacity.spec +++ b/audacity.spec @@ -23,24 +23,23 @@ %endif Name: audacity -Version: 2.2.1 +Version: 2.2.2 Release: 0 Summary: A Multi Track Digital Audio Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://audacityteam.org/ Source: https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz -#Source: %%{name}-minsrc-%%{version}.tar.xz -Source1: %{name}-license-nyquist -Source2: %{name}-rpmlintrc +#Source: https://www.fosshub.com/Audacity.html/%%{name}-minsrc-%%{version}.tar.xz +Source1: audacity-license-nyquist +Source2: audacity-rpmlintrc # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp. -Patch0: %{name}-no_buildstamp.patch +Patch0: audacity-no_buildstamp.patch # PATCH-FIX-OPENSUSE audacity-flacversion.patch davejplater@gmail.com -- Patch to fix build against libflac 1.3.1+. -Patch1: %{name}-flacversion.patch -# PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason. -Patch2: %{name}-fix-nonsense.patch +Patch1: audacity-flacversion.patch +Patch2: audacity-misc-errors.patch # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch -Patch3: %{name}-no_return_in_nonvoid.patch +Patch3: audacity-no_return_in_nonvoid.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -106,8 +105,8 @@ physical memory size can be edited. %setup -q -n %{name}-Audacity-%{version} %patch0 %patch1 -p0 -%patch2 -p0 -%patch3 -p1 +%patch3 -p0 +%patch2 cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. From c307e966366a2af6be3813f628f93fe8da066eee839c2e306281e59d96253634 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 22 Feb 2018 12:54:13 +0000 Subject: [PATCH 2/2] Accepting request 579001 from home:plater %license OBS-URL: https://build.opensuse.org/request/show/579001 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=120 --- audacity.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audacity.spec b/audacity.spec index a549581..4807a3a 100644 --- a/audacity.spec +++ b/audacity.spec @@ -164,7 +164,8 @@ rm -rf %{buildroot}%{_datadir}/pixmaps/ %files %defattr(-,root,root) -%doc LICENSE.txt LICENSE_NYQUIST.txt README.txt +%doc README.txt +%license LICENSE.txt LICENSE_NYQUIST.txt %doc %{_docdir}/%{name}/ %{_bindir}/%{name} %{_datadir}/%{name}/