Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2022-04-21 15:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Thu Apr 21 15:42:48 2022 rev:101 rq:971356 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2022-04-14 17:26:24.399329392 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new.1538/audacity.changes 2022-04-21 15:49:04.484342903 +0200 @@ -1,0 +2,10 @@ +Thu Apr 21 09:00:40 UTC 2022 - Dave Plater <[email protected]> + +- Add ldconfig post and postun for audacity's own libs to solve + boo#1198551 +- Fix audacity's build against wxWidgets 3.1.6 with two patches + from git: + 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch and + 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch + +------------------------------------------------------------------- New: ---- 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.130ool/_old 2022-04-21 15:49:05.148343612 +0200 +++ /var/tmp/diff_new_pack.130ool/_new 2022-04-21 15:49:05.156343621 +0200 @@ -35,6 +35,8 @@ Patch1: audacity-no_return_in_nonvoid.patch Patch2: missing-include.patch Patch3: no-more-strip.patch +Patch4: 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch +Patch5: 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -173,7 +175,6 @@ rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} -%if 0%{?suse_version} == 1500 %post ldconfig %{_libdir}/%{name} %end @@ -182,8 +183,6 @@ ldconfig %{_libdir}/%{name} %end -%endif - %files %defattr(-,root,root) %doc README.txt ++++++ 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch ++++++ >From 342c4b588f2f069a2df2157ac166237a54277b3a Mon Sep 17 00:00:00 2001 From: Ian McInerney <[email protected]> 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 54b5f146c..7fe816154 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>( -- 2.34.1 ++++++ 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch ++++++ >From efc11c4ac50ac51cd71d4dcfa84e63b11000c3f5 Mon Sep 17 00:00:00 2001 From: Ian McInerney <[email protected]> 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 d6e2576bf..e3979249c 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]); -- 2.34.1
