[audacity-freeworld] Fix lang (rfbz#6117)

commit 4ae68048657e62cc7be9d9e84c99a1e915ae0b2f Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Oct 26 09:26:29 2021 +0100 Fix lang (rfbz#6117) Fix_lang.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ audacity-freeworld.spec | 7 ++++++- 2 files changed, 51 insertions(+), 1 deletion(-) --- diff --git a/Fix_lang.patch b/Fix_lang.patch new file mode 100644 index 0000000..7bcb9c5 --- /dev/null +++ b/Fix_lang.patch @@ -0,0 +1,45 @@ +From 055862af4062e2feecd445fddfa87714c53edb50 Mon Sep 17 00:00:00 2001 +From: Peter Jonas <shoogle(a)users.noreply.github.com&gt; +Date: Wed, 15 Sep 2021 20:32:54 +0100 +Subject: [PATCH] Restore missing localizations on Linux + +The INSTALL_PREFIX variable in src/audacity_config.h.in was being +passed into the program as an empty string. The file is configured +in the top-level CMakeLists.txt but INSTALL_PREFIX is defined in +src/CMakeLists.txt. CMake variables are not passed to the parent scope +unless explicitly requested. + +Partially fix #1382. Allows Audacity to find the translations when they +are at the default location specified by INSTALL_PREFIX, but not if +they have been moved elsewhere. This works for distro builds but it's +not enough to get the AppImage working again. +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e56220fa73..49303b58e00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -316,7 +316,7@@ else() + endif() + + set( _DEST "${_DESTDIR}" ) +-set( _PREFIX "${CMAKE_INSTALL_PREFIX}" ) ++set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) + set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) + set( _DATADIR "${CMAKE_INSTALL_DATADIR}" ) + set( _PKGLIB "${_LIBDIR}/audacity" ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e61eba8dcbb..7938f9f42e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1122,7 +1122,6 @@ list( APPEND LIBRARIES + ) + + set( BUILDING_AUDACITY YES ) +-set( INSTALL_PREFIX "${_PREFIX}" ) + set( PKGLIBDIR "${_PKGLIBDIR}" ) + set( LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}" ) + set( HAVE_GTK ${GTK_FOUND} ) diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 8321e92..9775c07 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -15,7 +15,7 @@ Name: audacity-freeworld Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: http://audacity.sourceforge.net @@ -39,6 +39,7 @@ Patch2: 0001-Adds-an-option-to-disable-Conan.patch Patch3: 0001-Scope-libraries-required-by-the-optional-features.patch Patch4: 0001-Fixes-wxwidgets-fixup-script.patch Patch5: Fixes-GCC11-compatibility.patch +Patch6: Fix_lang.patch BuildRequires: cmake BuildRequires: gettext-devel @@ -112,6 +113,7 @@ This build has support for mp3 and ffmpeg import/export. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/ @@ -204,6 +206,9 @@ rm -f %{buildroot}%{_prefix}/%{realname} %license LICENSE.txt %changelog +* Tue Oct 26 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3.0.5-3 +- Fix lang (rfbz#6117) + * Tue Oct 19 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3.0.5-2 - Filter internal libs from provides and requires (rfbz#6112)