Dear maintainer,
I've uploaded an NMU for freespace2-launcher-wxlauncher (versioned as
0.11.0+dfsg-3.1).
The diff is attached to this message.
cu
Adrian
diff -Nru freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/changelog freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/changelog
--- freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/changelog 2019-10-12 12:44:35.000000000 +0300
+++ freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/changelog 2023-02-08 11:47:07.000000000 +0200
@@ -1,3 +1,11 @@
+freespace2-launcher-wxlauncher (0.11.0+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch to wxWidgets 3.2 using patches from upstream pull request.
+ (Closes: #1019772)
+
+ -- Adrian Bunk <b...@debian.org> Wed, 08 Feb 2023 11:47:07 +0200
+
freespace2-launcher-wxlauncher (0.11.0+dfsg-3) unstable; urgency=medium
* libwxgtk3.0-dev -> libwxgtk3.0-gtk3-dev (Closes: #933465).
diff -Nru freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/control freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/control
--- freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/control 2019-10-12 12:43:31.000000000 +0300
+++ freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/control 2023-02-08 11:45:32.000000000 +0200
@@ -7,7 +7,7 @@
,cmake
,libopenal-dev
,libsdl2-dev
- ,libwxgtk3.0-gtk3-dev
+ ,libwxgtk3.2-dev
,python3
,python3-markdown
# Python2 support on build time:
diff -Nru freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0001-Fix-compile-error-with-wxwidgets-3.2.patch freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0001-Fix-compile-error-with-wxwidgets-3.2.patch
--- freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0001-Fix-compile-error-with-wxwidgets-3.2.patch 1970-01-01 02:00:00.000000000 +0200
+++ freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0001-Fix-compile-error-with-wxwidgets-3.2.patch 2023-02-08 11:47:07.000000000 +0200
@@ -0,0 +1,25 @@
+From f3c9f8e3311dc4d8c7b63f69497cba965cc716cf Mon Sep 17 00:00:00 2001
+From: Yuri Pieters <magejohny...@gmail.com>
+Date: Tue, 13 Dec 2022 16:00:11 +0000
+Subject: Fix compile error with wxwidgets 3.2
+
+---
+ code/controls/ModList.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/code/controls/ModList.cpp b/code/controls/ModList.cpp
+index 3195ab8..29b2ab2 100644
+--- a/code/controls/ModList.cpp
++++ b/code/controls/ModList.cpp
+@@ -50,7 +50,7 @@ const wxString NO_MOD(_("(No mod)"));
+ // to keep the presets box from overlapping with flag list
+ const size_t MAX_PRESET_NAME_LENGTH = 32;
+
+-class ModInfoDialog: wxDialog {
++class ModInfoDialog: public wxDialog {
+ public:
+ ModInfoDialog(ModItem* item, wxWindow* parent);
+ void OnLinkClicked(wxHtmlLinkEvent &event);
+--
+2.30.2
+
diff -Nru freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0002-Fix-some-assertion-errors-from-calls-to-the-logger.patch freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0002-Fix-some-assertion-errors-from-calls-to-the-logger.patch
--- freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0002-Fix-some-assertion-errors-from-calls-to-the-logger.patch 1970-01-01 02:00:00.000000000 +0200
+++ freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/0002-Fix-some-assertion-errors-from-calls-to-the-logger.patch 2023-02-08 11:47:07.000000000 +0200
@@ -0,0 +1,52 @@
+From 4c61d2a68bdefd3b3270afede832caf1310ce577 Mon Sep 17 00:00:00 2001
+From: Yuri Pieters <magejohny...@gmail.com>
+Date: Tue, 13 Dec 2022 17:57:52 +0000
+Subject: Fix some assertion errors from calls to the logger
+
+---
+ code/apis/ProfileManager.cpp | 6 +++---
+ code/datastructures/FSOExecutable.cpp | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/code/apis/ProfileManager.cpp b/code/apis/ProfileManager.cpp
+index 152ff22..2b4b2a6 100644
+--- a/code/apis/ProfileManager.cpp
++++ b/code/apis/ProfileManager.cpp
+@@ -136,7 +136,7 @@ bool ProMan::Initialize(Flags flags) {
+ wxArrayString foundProfiles;
+ wxDir::GetAllFiles(GetProfileStorageFolder(), &foundProfiles, wxT_2("pro?????.ini"));
+
+- wxLogInfo(wxT_2(" Found %d profile(s)."), foundProfiles.Count());
++ wxLogInfo(wxT_2(" Found %u profile(s)."), static_cast<unsigned>(foundProfiles.Count()));
+ for( size_t i = 0; i < foundProfiles.Count(); i++) {
+ wxLogDebug(wxT_2(" Opening %s"), foundProfiles[i].c_str());
+ wxFFileInputStream instream(foundProfiles[i]);
+@@ -1430,8 +1430,8 @@ void ProMan::TestConfigFunctions(wxConfigBase& src) {
+ wxLogDebug(_T("contents of dest config after clearing:"));
+ LogConfigContents(*dest);
+
+- wxLogDebug(_T("after clearing, dest has %d entries and %d groups"),
+- dest->GetNumberOfEntries(true), dest->GetNumberOfGroups(true));
++ wxLogDebug(_T("after clearing, dest has %u entries and %u groups"),
++ static_cast<unsigned>(dest->GetNumberOfEntries(true)), static_cast<unsigned>(dest->GetNumberOfGroups(true)));
+
+ wxLogDebug(_T("recopying src to dest"));
+
+diff --git a/code/datastructures/FSOExecutable.cpp b/code/datastructures/FSOExecutable.cpp
+index 9b3feed..ccef0e4 100644
+--- a/code/datastructures/FSOExecutable.cpp
++++ b/code/datastructures/FSOExecutable.cpp
+@@ -173,8 +173,8 @@ wxArrayString FSOExecutable::GetBinariesFromRootFolder(const wxFileName& path, c
+
+ if (!quiet) {
+ wxString execType = globPattern.Lower().Find(_T("fred")) == wxNOT_FOUND ? _T("FS2") : _T("FRED2");
+- wxLogInfo(_T(" Found %d %s Open executables in '%s'"),
+- files.GetCount(), execType.c_str(), path.GetPath().c_str());
++ wxLogInfo(_T(" Found %u %s Open executables in '%s'"),
++ static_cast<unsigned>(files.GetCount()), execType.c_str(), path.GetPath().c_str());
+
+ for (size_t i = 0, n = files.GetCount(); i < n; ++i) {
+ wxLogDebug(_T("Found executable: %s"), files.Item(i).c_str());
+--
+2.30.2
+
diff -Nru freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/series freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/series
--- freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/series 2015-04-16 02:25:20.000000000 +0300
+++ freespace2-launcher-wxlauncher-0.11.0+dfsg/debian/patches/series 2023-02-08 11:46:44.000000000 +0200
@@ -1 +1,3 @@
debian-path.patch
+0001-Fix-compile-error-with-wxwidgets-3.2.patch
+0002-Fix-some-assertion-errors-from-calls-to-the-logger.patch
