Dave Plater
fac9ee7869
- Update to version 3.0.4 - Add git patches: 0001-Adds-an-option-to-disable-Conan.patch, 0001-Scope-libraries-required-by-the-optional-features.patch 0001-Fixes-wxwidgets-fixup-script.patch - Added patch adapted from git, Fixes-GCC11-compatibility.patch - Removed obsolete patches, audacity-remove-wx-test.patch and b4b5cc8.patch - Upstream changes: *This is a hotfix release that fixes a bug with envelope points, which could multiply uncontrollably and cause Audacity to crash. *In particular: #1476: Envelope points are multiplied when using Filter Curve EQ or Graphic EQ #1477: Filter Curve EQ will crash if there is an envelope point outside of the selection *This fix re-introduces an earlier, but way less destructive bug: bugzilla 208 / #1500: Some effects delete Envelope Control Points or do not move them when timeline changes *Other than that, this release is identical to Version 3.0.3. OBS-URL: https://build.opensuse.org/request/show/914616 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=167
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 65886f5c2c568572602f6d82f4717508cb720f10 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Vedenko <vedenko@gmail.com>
|
|
Date: Fri, 18 Jun 2021 20:29:22 +0300
|
|
Subject: [PATCH] Fixes wxwidgets fixup script
|
|
|
|
---
|
|
.../cmake-modules/dependencies/wxwidgets.cmake | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
|
|
index 2def9ae85..4b35e8947 100644
|
|
--- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
|
|
+++ b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
|
|
@@ -1,4 +1,10 @@
|
|
-if( ${_OPT}use_wxwidgets STREQUAL "system" )
|
|
+if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
|
|
+ # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
|
|
+ # Still - let's perform the sanity check first.
|
|
+ if( NOT wxWidgets_FOUND )
|
|
+ find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
|
|
+ endif()
|
|
+
|
|
if( NOT TARGET wxwidgets::wxwidgets )
|
|
add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
|
|
endif()
|
|
@@ -74,6 +80,8 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
|
|
|
|
set( toolkit "${wxWidgets_LIBRARIES}" )
|
|
|
|
+ message(STATUS "Trying to retrieve GTK version from ${toolkit}")
|
|
+
|
|
if( "${toolkit}" MATCHES ".*gtk2.*" )
|
|
set( gtk gtk+-2.0 )
|
|
set( glib glib-2.0 )
|
|
--
|
|
2.26.2
|
|
|