diff --git a/audacity-implicit-fortify-decl.patch b/audacity-implicit-fortify-decl.patch new file mode 100644 index 0000000..9e1a678 --- /dev/null +++ b/audacity-implicit-fortify-decl.patch @@ -0,0 +1,17 @@ +Index: b/lib-src/libnyquist/nyquist/xlisp/security.c +=================================================================== +--- a/lib-src/libnyquist/nyquist/xlisp/security.c 2020-06-15 10:39:50.030730823 +0200 ++++ b/lib-src/libnyquist/nyquist/xlisp/security.c 2020-06-15 10:59:45.779010172 +0200 +@@ -4,12 +4,7 @@ + */ + + #include +-#if defined(UNIX) || defined(__APPLE__) + #include +-#endif +-#ifdef WIN32 +-#include +-#endif + #include + #include + diff --git a/audacity.changes b/audacity.changes index a5eae41..b10457a 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 15 09:28:20 UTC 2020 - Dave Plater + +- Fix Leap:15.1 build with audacity-implicit-fortify-decl.patch. + ------------------------------------------------------------------- Mon Jun 8 09:37:32 UTC 2020 - Dave Plater diff --git a/audacity.spec b/audacity.spec index ba09190..6b3d77d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -34,6 +34,8 @@ 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 +# PATCH-FIX-OPENSUSE audacity-implicit-fortify-decl.patch davejplater@gmail.com -- Leap:15.1's build misses "UNIX" definition in nyquist/xlisp/security.c +Patch4: audacity-implicit-fortify-decl.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -99,8 +101,7 @@ This package contains extra plugins for audacity. cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. -rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ -rm -rf lib-src/lame +rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/ %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -135,6 +136,7 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project. %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm rm -rf %{buildroot}%{_datadir}/pixmaps/ rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt +cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt %find_lang %{name} %files plugins @@ -145,7 +147,7 @@ rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt %files %defattr(-,root,root) %doc README.txt -%license LICENSE.txt LICENSE_NYQUIST.txt +%license LICENSE.txt LICENSE_NYQUIST.txt portmixer.LICENSE.txt %doc %{_docdir}/%{name}/ %{_bindir}/%{name} %{_datadir}/%{name}/