commit 3fb42794c77996996bcca61b7ebc428493425518 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sat Oct 2 13:58:08 2021 +0100 Add Fedora patches audacity-freeworld.spec | 13 ++++++++++++- find-jack.patch | 22 ++++++++++++++++++++++ permissions-fix.patch | 11 +++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) --- diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 2d2f364..037c2e3 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -1,3 +1,5 @@ +# Disable rpath checking until upstream fixes the rpath: https://github.com/audacity/audacity/issues/1008 +%global __brp_check_rpaths %{nil} %global __requires_exclude ^libwx_baseu-3.1.so|^libwx_baseu_net-3.1.so|^libwx_baseu_xml-3.1.so|^libwx_gtk2u_core-3.1.so|^libwx_gtk2u_html-3.1.so|^libwx_gtk2u_qa-3.1.so @@ -12,7 +14,7 @@ Name: audacity-freeworld Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: http://audacity.sourceforge.net @@ -38,6 +40,10 @@ Patch0: system-wx.patch Patch1: audacity-2.4.2-fix-portmidi-as-system.patch # Fix libmp3lame detection from cmake Patch2: audacity-2.4.2-fix-libmp3lame-as-system.patch +# Fix CMake find of the Jack module (RHBZ 1972963) - Remove for 3.0.3 (backported from master branch - https://github.com/audacity/audacity/commit/b4b5cc812483b311627bba48e26b9...) +Patch3: find-jack.patch +# Fix CVE-2020-1867 - Remove for 3.0.3 (backported from https://github.com/audacity/audacity/pull/700) +Patch4: permissions-fix.patch BuildRequires: cmake BuildRequires: gettext-devel @@ -114,6 +120,8 @@ tar -xf %{SOURCE1} -C %{_vpath_builddir}/cmake-proxies/wxWidgets/wxwidgets --str %patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %if 0%{?rhel} == 7 @@ -200,6 +208,9 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %license LICENSE.txt %changelog +* Sat Oct 02 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3.0.2-3 +- Add Fedora patches + * Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/find-jack.patch b/find-jack.patch new file mode 100644 index 0000000..8f9676e --- /dev/null +++ b/find-jack.patch @@ -0,0 +1,22 @@ +From b4b5cc812483b311627bba48e26b91ae389ce713 Mon Sep 17 00:00:00 2001 +From: SteveDaulton <stevedaulton(a)gmail.com&gt; +Date: Mon, 26 Apr 2021 15:45:40 +0100 +Subject: [PATCH] Bug 2757 - No support for Jack Audio System + +--- + cmake-proxies/portaudio-v19/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake-proxies/portaudio-v19/CMakeLists.txt b/cmake-proxies/portaudio-v19/CMakeLists.txt +index d8930ff8ce5..9baf5f6a8eb 100644 +--- a/cmake-proxies/portaudio-v19/CMakeLists.txt ++++ b/cmake-proxies/portaudio-v19/CMakeLists.txt +@@ -88,7 +88,7 @@ cmd_option( ${_OPT}use_pa_jack + + if( NOT ${_OPT}use_pa_jack STREQUAL "off" ) + # Find it +- find_package( jack ) ++ find_package( Jack ) + if( NOT JACK_FOUND) + set_cache_value( ${_OPT}use_pa_jack "off" ) + endif() diff --git a/permissions-fix.patch b/permissions-fix.patch new file mode 100644 index 0000000..4a97035 --- /dev/null +++ b/permissions-fix.patch @@ -0,0 +1,11 @@ +--- src/AudacityApp.cpp 2021-04-11 11:29:19.000000000 +0100 ++++ src/AudacityApp.cpp 2021-06-17 23:41:43.333628774 +0100 +@@ -1692,7 +1692,7 @@ + // The permissions don't always seem to be set on + // some platforms. Hopefully this fixes it... + #ifdef __UNIX__ +- chmod(OSFILENAME(temp), 0755); ++ chmod(OSFILENAME(temp), 0700); + #endif + + TempDirectory::ResetTempDir();