diff options
author | Eric Hameleers <alien@slackware.com> | 2022-09-19 19:47:12 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-09-19 19:47:12 +0000 |
commit | 8eaeb20bc8bc21b1d0885ee3b9ce8fa1a7806c96 (patch) | |
tree | 66b501db9c94cd55d48816a94e6c81404f13d910 /audacity | |
parent | 80f9b1ad7a14da8d5f73f1a4d4fbb1862ce69f70 (diff) | |
download | asb-8eaeb20bc8bc21b1d0885ee3b9ce8fa1a7806c96.tar.gz asb-8eaeb20bc8bc21b1d0885ee3b9ce8fa1a7806c96.tar.xz |
Initial revision
Diffstat (limited to 'audacity')
-rw-r--r-- | audacity/build/patches/audacity-3.1.3_wxbitmap_constructor.patch | 28 | ||||
-rw-r--r-- | audacity/build/patches/audacity-3.1.3_wxwidgets_3.1.6.patch | 41 |
2 files changed, 69 insertions, 0 deletions
diff --git a/audacity/build/patches/audacity-3.1.3_wxbitmap_constructor.patch b/audacity/build/patches/audacity-3.1.3_wxbitmap_constructor.patch new file mode 100644 index 00000000..04040794 --- /dev/null +++ b/audacity/build/patches/audacity-3.1.3_wxbitmap_constructor.patch @@ -0,0 +1,28 @@ +From 342c4b588f2f069a2df2157ac166237a54277b3a Mon Sep 17 00:00:00 2001 +From: Ian McInerney <ian.s.mcinerney@ieee.org> +Date: Fri, 8 Apr 2022 01:27:52 +0100 +Subject: [PATCH] Call the proper wxBitmap constructor for XPM data + +wxBitmap back to at least 3.0.0 did not have a constructor for an XPM +image that took a size parameter, it would only take the XPM data +itself. + +I don't know how this compiled until now, but it doesn't anymore when +the size is included and built against wx 3.1.6 in Fedora. +--- + src/MixerBoard.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp +index 54b5f146cc7..7fe81615474 100644 +--- a/src/MixerBoard.cpp ++++ b/src/MixerBoard.cpp +@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments() + wxMemoryDC dc; + + for (const auto &data : table) { +- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24); ++ auto bmp = std::make_unique<wxBitmap>(data.bitmap); + dc.SelectObject(*bmp); + AColor::Bevel(dc, false, bev); + mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>( diff --git a/audacity/build/patches/audacity-3.1.3_wxwidgets_3.1.6.patch b/audacity/build/patches/audacity-3.1.3_wxwidgets_3.1.6.patch new file mode 100644 index 00000000..b2c0d687 --- /dev/null +++ b/audacity/build/patches/audacity-3.1.3_wxwidgets_3.1.6.patch @@ -0,0 +1,41 @@ +From efc11c4ac50ac51cd71d4dcfa84e63b11000c3f5 Mon Sep 17 00:00:00 2001 +From: Ian McInerney <ian.s.mcinerney@ieee.org> +Date: Fri, 8 Apr 2022 01:08:12 +0100 +Subject: [PATCH] Remove custom languages in wx 3.1.6 and above + +Basque was added as a language with identifier "eu" into wx 3.1.6, so +there is no more need to provide custom languages. Additionally, this +struct changed formatting in 3.1.6, meaning it threw a compile error +when included (so it would have to be fixed if still needed). +--- + src/AudacityApp.cpp | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp +index d6e2576bf48..e3979249ceb 100644 +--- a/src/AudacityApp.cpp ++++ b/src/AudacityApp.cpp +@@ -992,12 +992,10 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event)) + #define WL(lang,sublang) + #endif + +-#if wxCHECK_VERSION(3, 0, 1) ++#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) + wxLanguageInfo userLangs[] = + { +- // Bosnian is defined in wxWidgets already +-// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight }, +- ++ // Included upstream in version 3.1.6 + { wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight }, + }; + #endif +@@ -1332,7 +1330,7 @@ bool AudacityApp::OnInit() + // + // TODO: The whole Language initialization really need to be reworked. + // It's all over the place. +-#if wxCHECK_VERSION(3, 0, 1) ++#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) + for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++) + { + wxLocale::AddLanguage(userLangs[i]); |