[scorched3d] 15/39: Drop 0008-wx3.0-compat.patch
Markus Koschany
apo at moszumanska.debian.org
Sat Jul 16 03:28:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository scorched3d.
commit 2f1e2608dd0a86f38ed7796d4970a8de26d84497
Author: Markus Koschany <apo at debian.org>
Date: Fri Jul 15 17:42:35 2016 +0200
Drop 0008-wx3.0-compat.patch
---
debian/patches/0008-wx3.0-compat.patch | 166 ---------------------------------
debian/patches/series | 1 -
2 files changed, 167 deletions(-)
diff --git a/debian/patches/0008-wx3.0-compat.patch b/debian/patches/0008-wx3.0-compat.patch
deleted file mode 100644
index 8eaca3c..0000000
--- a/debian/patches/0008-wx3.0-compat.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Description: Fix to build with wxWidgets 3.0
-Author: Olly Betts <olly at survex.com>
-Last-Update: 2014-05-01
-
---- a/src/launcher/wxdialogs/Display.cpp
-+++ b/src/launcher/wxdialogs/Display.cpp
-@@ -26,7 +26,7 @@
- // Display settings
- wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
- wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
-- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
-+ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
- wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
- IDC_DISPLAY_CTRL =
- new wxComboBox(parent, -1,
-@@ -88,7 +88,7 @@
- // Sound settings
- wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
- wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
-- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
-+ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
- wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
- wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
- wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
-@@ -137,7 +137,7 @@
- wxT("Game Detail Options"));
- wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
-
-- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
-+ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
- IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
- IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
- IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
-@@ -256,7 +256,7 @@
- wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1,
- wxT("Graphics Detail"));
- wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
-- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
-+ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
-
- IDC_NOWATERREF_CTRL =
- new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
-@@ -471,7 +471,7 @@
- {
- wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1,
- wxDefaultPosition, wxSize(480, 250));
-- wxSizer *sizer = new wxFlexGridSizer(5, 1);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
-
- keyboardKeyList.clear();
- if (!Keyboard::instance()->loadKeyFile())
---- a/src/launcher/wxdialogs/DisplayDialog.cpp
-+++ b/src/launcher/wxdialogs/DisplayDialog.cpp
-@@ -449,15 +449,15 @@
- IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
- IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
- IDC_VOLUME_CTRL->SetRange(0, 128);
-- IDC_VOLUME_CTRL->SetTickFreq(4, 0);
-+ IDC_VOLUME_CTRL->SetTickFreq(4);
- IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
- IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
- IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
-- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
-+ IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
- IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
- IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
- IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
-- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
-+ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
- IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
- IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
- IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
-@@ -733,7 +733,7 @@
- convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename
- wxT(""), // default extension
- wxT("*.s3m"),
-- wxSAVE);
-+ wxFD_SAVE);
- if (file.empty()) return;
- ModFiles files;
- if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))
-@@ -757,7 +757,7 @@
- wxT(""), // default filename
- wxT(""), // default extension
- wxT("*.s3m"),
-- wxOPEN | wxFILE_MUST_EXIST);
-+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
- if (file.empty()) return;
- ModFiles files;
- std::string mod;
---- a/src/launcher/wxdialogs/KeyDialog.cpp
-+++ b/src/launcher/wxdialogs/KeyDialog.cpp
-@@ -107,7 +107,7 @@
- keyDialogControlDown = event.ControlDown();
- keyDialogShiftDown = event.ShiftDown();
- keyDialogAltDown = event.AltDown();
-- keyDialogKeyCode = event.KeyCode();
-+ keyDialogKeyCode = event.GetKeyCode();
- frame_->EndModal(0);
- }
- }
---- a/src/launcher/wxdialogs/SettingsDialog.cpp
-+++ b/src/launcher/wxdialogs/SettingsDialog.cpp
-@@ -105,7 +105,7 @@
- mainPanel_ = new wxPanel(book_, -1);
- book_->AddPage(mainPanel_, wxT("Main"));
- wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
-- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- setters_.push_back(
-@@ -166,7 +166,7 @@
- {
- moneyPanel_ = new wxPanel(book_, -1);
- wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
-- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- setters_.push_back(
-@@ -215,7 +215,7 @@
- {
- scorePanel_ = new wxPanel(book_, -1);
- wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
-- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- setters_.push_back(
-@@ -249,7 +249,7 @@
- {
- weaponsPanel_ = new wxPanel(book_, -1);
- wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
-- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- setters_.push_back(
-@@ -286,7 +286,7 @@
- {
- envPanel_ = new wxPanel(book_, -1);
- wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
-- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- setters_.push_back(
-@@ -337,7 +337,7 @@
- wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1,
- wxDefaultPosition, wxSize(225, 200));
-
-- wxSizer *sizer = new wxFlexGridSizer(3, 3);
-+ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
- int i = 0;
- std::list<LandscapeDefinitionsEntry> &defns =
- landscapeDefinitions.getAllLandscapes();
-@@ -438,7 +438,7 @@
- wxT("Players are persistent for game"));
- playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
-
-- wxSizer *sizer = new wxGridSizer(3, 3);
-+ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
- playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
-
- for (int i=0; i<24; i++)
diff --git a/debian/patches/series b/debian/patches/series
index 310b526..9617fa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
0004-ftbfs-gcc-4.7.patch
0006-fix-freetype-includes.patch
0007-spelling.patch
-0008-wx3.0-compat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git
More information about the Pkg-games-commits
mailing list