Accepting request 639770 from multimedia:apps

- Add 0001-Fix-bug-1992.patch from git to fix issue 1992 OBS-URL: https://build.opensuse.org/request/show/639770 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=80
2018-10-11 09:50:09 +00:00 · 2018-10-11 09:50:09 +00:00 · 09e62feaa7
commit 09e62feaa7
parent 5ba8723638 cf520fb80c
7 changed files with 101 additions and 37 deletions
--- a/0001-Fix-bug-1992.patch
+++ b/0001-Fix-bug-1992.patch
@ -0,0 +1,25 @@
+From a17af37c1ef9a4611add492d8ba02d1dfb270210 Mon Sep 17 00:00:00 2001
+From: Steve Daulton <stevedaulton@gmail.com>
+Date: Tue, 2 Oct 2018 22:40:10 +0100
+Subject: [PATCH] Fix bug 1992
+
+---
+ src/Menus.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: audacity-Audacity-2.3.0/src/Menus.cpp
+===================================================================
+--- audacity-Audacity-2.3.0.orig/src/Menus.cpp	2018-09-20 16:35:07.000000000 +0200
+++ audacity-Audacity-2.3.0/src/Menus.cpp	2018-10-03 16:36:27.684154542 +0200
+@@ -4572,7 +4572,10 @@ bool AudacityProject::DoEffect(const Plu
+    TrackListIterator iter(GetTracks());
+    Track *t = iter.First();
+    wxWindow *focus = wxWindow::FindFocus();
+-   auto parent = focus->GetParent();
+   wxWindow *parent;
+   if (focus != nullptr) {
+      parent = focus->GetParent();
+   }
+ 
+    bool success = false;
+    auto cleanup = finally( [&] {
--- a/Audacity-2.2.2.tar.gz
+++ b/Audacity-2.2.2.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3
-size 25947462
--- a/Audacity-2.3.0.tar.gz
+++ b/Audacity-2.3.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e
+size 27479664
--- a/audacity-misc-errors.patch
+++ b/audacity-misc-errors.patch
@ -25,8 +25,8 @@ 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
+--- 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
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <stdio.h>
@ -36,26 +36,11 @@ Index: lib-src/portmidi/pm_linux/finddefault.c
 #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:
+--- 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
+@@ -135,7 +135,7 @@ public:
 
    bool ReadFloat(const wxString & key, float *pf) const
    {
--- a/audacity-no_return_in_nonvoid.patch
+++ b/audacity-no_return_in_nonvoid.patch
@ -1,19 +1,19 @@
 Index: src/widgets/NumericTextCtrl.cpp
 ===================================================================
--- 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();
+--- 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
          case NumericConverter::BANDWIDTH:
-             return BandwidthConverterFormats();
+             return WXSIZEOF(BandwidthConverterFormats_);
       }
-+   return std::vector<BuiltinFormatString> {};
+      return WXSIZEOF(BandwidthConverterFormats_);
    }
 }
 
 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
+--- 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
@@ -603,7 +603,10 @@ LVAL xcleanup(void)
 {
     xllastarg();
--- a/audacity.changes
+++ b/audacity.changes
@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Wed Oct  3 14:39:52 UTC 2018 - davejplater@gmail.com
+
+- Add 0001-Fix-bug-1992.patch from git to fix issue 1992
+
+-------------------------------------------------------------------
+Mon Oct  1 06:58:42 UTC 2018 - davejplater@gmail.com
+
+- Update to release 2.3.0
+- Rebased audacity-misc-errors.patch and
+  audacity-no_return_in_nonvoid.patch
+- Added --disable-dynamic-loading build flag for ffmpeg-4 use.
+- Upstream changes:
+  *New feature – “Punch and Roll Recording”
+  *Pinned-play-head can now be repositioned by dragging
+  *Play-at-speed now can be adjusted whilst playing.
+  *Toolbars controlling volume and speed can now be resized for
+   greater precision
+  *New commands: New ‘Tools’ menu & New ‘Scriptables’ commands
+  *Nyquist gains AUD-DO command
+  *Nyquist effects are now translatable and translated
+  *More dialogs have help buttons now
+  *Increased legibility of trackname display
+  *Half-wave option for collapsed tracks
+  *Sliding Stretch
+  *Dialog (option) for entering labels
+  *Inconsistent behavior when recording with a selection–bug #1839
+  *Ctrl + M does not open label for editing – bug #1852
+  *Vertical Zoom in by clicking in the vertical Scale, or context
+   menu, in waveform views is inconsistent – bug #1810
+  *Deletion of all tracks cannot be undone – bug #1845
+  *Timer Record with a selection present can get a truncated
+   recording with data loss – bug #1851
+  *Duplicate shortcuts can be created – bug #1786
+  *Labels longer than 260 characters are now supported – bug #1905
+  *Using Spectrogram Settings in TCP or using Preferences causes
+   Audacity to reset Project Rate to default rate in Quality
+   Preferences – bug #1977
+  *Cut Preview should play all selected/sync-locked tracks,
+   respecting Mute/Solo during preview – bug #231
+
+-------------------------------------------------------------------
+Sun Apr 29 08:41:27 UTC 2018 - davejplater@gmail.com
+
+- Ensure that Leap:42.3 gcc conditional doesn't interfere with
+  Tumbleweed gcc used for build.
+
 -------------------------------------------------------------------
 Thu Feb 22 09:54:45 UTC 2018 - davejplater@gmail.com

--- a/audacity.spec
+++ b/audacity.spec
@ -23,10 +23,10 @@
 %endif

 Name:           audacity
-Version:        2.2.2
+Version:        2.3.0
 Release:        0
 Summary:        A Multi Track Digital Audio Editor
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 Url:            http://audacityteam.org/
 Source:         https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz
@ -40,13 +40,14 @@ Patch1:         audacity-flacversion.patch
 Patch2:         audacity-misc-errors.patch
 # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch
 Patch3:         audacity-no_return_in_nonvoid.patch
+Patch4:         0001-Fix-bug-1992.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 #Audacity only builds with gcc >= 4.9
 # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff and gcc >= 5
-%if 0%{?suse_version} < 1330
+%if 0%{?suse_version} == 1315
 BuildRequires:  cpp7
 BuildRequires:  gcc7
 BuildRequires:  gcc7-c++
@ -60,7 +61,6 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(flac) >= 1.3.1
 BuildRequires:  pkgconfig(flac++)
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4.0
 BuildRequires:  pkgconfig(id3tag)
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libavcodec) >= 51.53
@ -107,6 +107,7 @@ physical memory size can be edited.
 %patch1 -p0
 %patch3 -p0
 %patch2
+%patch4 -p1

 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
@ -116,10 +117,12 @@ rm -rf lib-src/lame
 %endif

 %build
+%if 0%{suse_version} == 1315
 # WARNING: Do not alter, only for Leap.
-test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7"
-test -x "$(type -p %{_bindir}/g++-7)" && export CXX="%{_bindir}/g++-7"
-test -x "$(type -p %{_bindir}/cpp-7)" && export CPP="%{_bindir}/cpp-7"
+export CC="%{_bindir}/gcc-7"
+export CXX="%{_bindir}/g++-7"
+export CPP="%{_bindir}/cpp-7"
+%endif

 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS -std=gnu++11"
@ -129,6 +132,9 @@ autoconf
 %ifnarch %ix86 x86_64
  --disable-sse                \
 %endif
+%if 0%{?suse_version} > 1501
+  --disable-dynamic-loading \
+  %endif
  --with-ffmpeg=system \
 %if %{with mad}
  --with-libmad=system \
@ -150,6 +156,7 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/
 mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.xpm \
  %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm
 rm -rf %{buildroot}%{_datadir}/pixmaps/
+rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt
 %find_lang %{name}

 %post