Control: tags 749834 + patch
With the attached patch, the package builds. I don't have the games it can
launch, so I can't test thoroughly, but the parts of the UI I can exercise
appear to work fine.
Cheers,
Olly
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/changelog freespace2-launcher-wxlauncher-0.9.4/debian/changelog
--- freespace2-launcher-wxlauncher-0.9.4/debian/changelog 2013-09-14 22:17:07.000000000 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/changelog 2014-08-30 20:10:07.000000000 -0300
@@ -1,3 +1,12 @@
+freespace2-launcher-wxlauncher (0.9.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxwidgets3.0 (Closes: #749834):
+ + New patch: wx3.0-compat.patch
+ + Pass -DNDEBUG to disable WXDEBUG checks.
+
+ -- Olly Betts <o...@survex.com> Sat, 30 Aug 2014 23:09:51 +0000
+
freespace2-launcher-wxlauncher (0.9.4-1) unstable; urgency=low
* New upstream release [June 2013].
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/control freespace2-launcher-wxlauncher-0.9.4/debian/control
--- freespace2-launcher-wxlauncher-0.9.4/debian/control 2013-05-21 01:36:04.000000000 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/control 2014-08-30 14:38:36.000000000 -0300
@@ -6,7 +6,7 @@
,cmake
,libopenal-dev
,libsdl-dev
- ,libwxgtk2.8-dev
+ ,libwxgtk3.0-dev
,python
,python-markdown
Standards-Version: 3.9.4
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/patches/series freespace2-launcher-wxlauncher-0.9.4/debian/patches/series
--- freespace2-launcher-wxlauncher-0.9.4/debian/patches/series 2013-09-14 21:55:41.000000000 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/patches/series 2014-08-30 16:39:01.000000000 -0300
@@ -1,2 +1,3 @@
debian-path.patch
issue_93.patch
+wx3.0-compat.patch
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch
--- freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch 1969-12-31 21:00:00.000000000 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch 2014-08-30 19:56:45.000000000 -0300
@@ -0,0 +1,92 @@
+Description: Fixes for wxwidgets 3.0 compatibility
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/749834
+Forwarded: no
+Last-Update: 2014-08-30
+
+Index: freespace2-launcher-wxlauncher-0.9.4/code/controls/ModList.cpp
+===================================================================
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/controls/ModList.cpp
++++ freespace2-launcher-wxlauncher-0.9.4/code/controls/ModList.cpp
+@@ -1351,8 +1351,8 @@ ModInfoDialog::ModInfoDialog(ModItem* it
+ links->SetPage(wxString::Format(_T("<center>%s%s%s%s</center>"),
+ (!item->website.IsEmpty()) ?
+ wxString::Format(_T("<a href='%s'>%s</a> :: "), item->website.c_str(), _("Website")).c_str():wxEmptyString,
+- wxString::Format(_T("<a href='%s'>%s</a>"), (!item->forum.IsEmpty()) ?
+- item->forum.c_str():_("http://www.hard-light.net/forums/index.php?board=124.0";), _("Forum")).c_str(),
++ wxString::Format(_T("<a href='%s'>%s</a>"), (!item->forum.IsEmpty() ?
++ item->forum:_("http://www.hard-light.net/forums/index.php?board=124.0";)).c_str(), _("Forum")).c_str(),
+ (!item->bugs.IsEmpty()) ?
+ wxString::Format(_T(" :: <a href='%s'>%s</a>"), item->bugs.c_str(), _("Bugs")).c_str() : wxEmptyString,
+ (!item->support.IsEmpty()) ?
+Index: freespace2-launcher-wxlauncher-0.9.4/code/apis/HelpManager.cpp
+===================================================================
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/apis/HelpManager.cpp
++++ freespace2-launcher-wxlauncher-0.9.4/code/apis/HelpManager.cpp
+@@ -59,7 +59,7 @@ bool HelpManager::Initialize() {
+ if ( file.FileExists() ) {
+ controller->AddBook(file, false);
+ } else {
+- ::wxLogWarning(_T("Unable to find help file %s"), file.GetFullName().c_str());
++ wxLogWarning(_T("Unable to find help file %s"), file.GetFullName().c_str());
+ delete controller;
+ controller = NULL;
+ return false;
+@@ -93,7 +93,7 @@ void HelpManager::OpenHelpById(WindowIDS
+ return;
+ }
+ }
+- ::wxLogInfo(_T(" ID %d does not have more specific help"), id);
++ wxLogInfo(_T(" ID %d does not have more specific help"), id);
+ }
+
+ void HelpManager::OpenMainHelpPage() {
+Index: freespace2-launcher-wxlauncher-0.9.4/code/apis/ProfileManager.cpp
+===================================================================
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/apis/ProfileManager.cpp
++++ freespace2-launcher-wxlauncher-0.9.4/code/apis/ProfileManager.cpp
+@@ -308,8 +308,8 @@ void ProMan::LoadNewsMapFromGlobalProfil
+ while (groupKeepGoing) {
+ globalProfile->SetPath(groupName);
+
+- if (globalProfile->Read(GBL_CFG_NET_THE_NEWS, theNews) &&
+- (globalProfile->Read(GBL_CFG_NET_NEWS_LAST_TIME, lastDownloadNewsStr))) {
++ if (globalProfile->Read(GBL_CFG_NET_THE_NEWS, &theNews) &&
++ (globalProfile->Read(GBL_CFG_NET_NEWS_LAST_TIME, &lastDownloadNewsStr))) {
+ if ((!theNews.IsEmpty()) &&
+ (NULL != lastDownloadNews.ParseFormat(
+ lastDownloadNewsStr, NEWS_LAST_TIME_FORMAT))) {
+Index: freespace2-launcher-wxlauncher-0.9.4/code/wxLauncherApp.cpp
+===================================================================
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/wxLauncherApp.cpp
++++ freespace2-launcher-wxlauncher-0.9.4/code/wxLauncherApp.cpp
+@@ -50,18 +50,18 @@ Foundation, Inc., 51 Franklin Street, Fi
+ IMPLEMENT_APP(wxLauncher);
+
+ const static wxCmdLineEntryDesc CmdLineOptions[] = {
+- {wxCMD_LINE_SWITCH, NULL, _T("session-only"),
+- _T("Do not remember the profile that is selected at exit")},
+- {wxCMD_LINE_SWITCH, NULL, _T("add-profile"),
+- _T("Add profile PROFILE from FILE. If PROFILE already exists ")
+- _T("it will not be overwritten. *Operator*")},
+- {wxCMD_LINE_SWITCH, NULL, _T("select-profile"),
+- _T("Make PROFILE the that wxLauncher will use on next run. *Operator*")},
+- {wxCMD_LINE_OPTION, NULL, _T("profile"),
+- _T("The name of a profile to operate on. Operand PROFILE."),
++ {wxCMD_LINE_SWITCH, NULL, wxT_2("session-only"),
++ wxT_2("Do not remember the profile that is selected at exit")},
++ {wxCMD_LINE_SWITCH, NULL, wxT_2("add-profile"),
++ wxT_2("Add profile PROFILE from FILE. If PROFILE already exists ")
++ wxT_2("it will not be overwritten. *Operator*")},
++ {wxCMD_LINE_SWITCH, NULL, wxT_2("select-profile"),
++ wxT_2("Make PROFILE the that wxLauncher will use on next run. *Operator*")},
++ {wxCMD_LINE_OPTION, NULL, wxT_2("profile"),
++ wxT_2("The name of a profile to operate on. Operand PROFILE."),
+ wxCMD_LINE_VAL_STRING, 0},
+- {wxCMD_LINE_OPTION, NULL, _T("file"),
+- _T("The path to a file to operate on. Operand FILE."),
++ {wxCMD_LINE_OPTION, NULL, wxT_2("file"),
++ wxT_2("The path to a file to operate on. Operand FILE."),
+ wxCMD_LINE_VAL_STRING, 0},
+ {wxCMD_LINE_NONE},
+ };
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/rules freespace2-launcher-wxlauncher-0.9.4/debian/rules
--- freespace2-launcher-wxlauncher-0.9.4/debian/rules 2013-01-07 11:13:49.000000000 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/rules 2014-08-30 20:09:49.000000000 -0300
@@ -7,6 +7,9 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
$(info DEB_BUILD_MAINT_OPTIONS:$(origin DEB_BUILD_MAINT_OPTIONS)=$(DEB_BUILD_MAINT_OPTIONS))
+# Disable wx3.0 WXDEBUG checks, as happened by default in wx2.8.
+export DEB_CPPFLAGS_MAINT_APPEND=-DNDEBUG
+
%:
dh $@ --parallel
