This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository megaglest.
commit 0690bc1a4af468e7902bf00beb1aacc7c546fe77 Author: Markus Koschany <[email protected]> Date: Sat Jan 31 15:43:02 2015 +0100 Drop wxWidgets-assertions.patch. Merged upstream. --- debian/patches/series | 1 - debian/patches/wxWidgets-assertions.patch | 168 ------------------------------ 2 files changed, 169 deletions(-) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 922fef6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -wxWidgets-assertions.patch diff --git a/debian/patches/wxWidgets-assertions.patch b/debian/patches/wxWidgets-assertions.patch deleted file mode 100644 index 7a7e06c..0000000 --- a/debian/patches/wxWidgets-assertions.patch +++ /dev/null @@ -1,168 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 1 Dec 2014 19:12:28 +0100 -Subject: wxWidgets assertions - -Fix wxWidgets assertions in megaglest_editor and megaglest_g3dviewer. - -Bug: https://bugs.debian.org/768572 -Forwarded: not-needed already fixed ---- - source/g3d_viewer/main.cpp | 23 +++++++++++++++-------- - source/g3d_viewer/main.h | 1 + - source/glest_map_editor/main.cpp | 20 +++++++++++++++----- - source/shared_lib/sources/graphics/model.cpp | 2 +- - 4 files changed, 32 insertions(+), 14 deletions(-) - -diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp -index 1276f73..a6cdb4a 100644 ---- a/source/g3d_viewer/main.cpp -+++ b/source/g3d_viewer/main.cpp -@@ -480,12 +480,15 @@ void MainWindow::setupTimer() { - } - - void MainWindow::setupStartupSettings() { -- GLuint err = glewInit(); -- if (GLEW_OK != err) { -+ -+ glCanvas->setCurrentGLContext(); -+ -+ GLuint err = glewInit(); -+ if (GLEW_OK != err) { - fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err)); - //return 1; - throw std::runtime_error((char *)glewGetErrorString(err)); -- } -+ } - - renderer= Renderer::getInstance(); - -@@ -567,7 +570,7 @@ MainWindow::~MainWindow(){ - void MainWindow::init() { - - #if wxCHECK_VERSION(2, 9, 3) -- glCanvas->setCurrentGLContext(); -+ //glCanvas->setCurrentGLContext(); - //printf("setcurrent #1\n"); - #elif wxCHECK_VERSION(2, 9, 1) - -@@ -585,7 +588,9 @@ void MainWindow::init() { - void MainWindow::onPaint(wxPaintEvent &event) { - if(!IsShown()) return; - --#if wxCHECK_VERSION(2, 9, 3) -+#if wxCHECK_VERSION(2, 9, 4) -+ //glCanvas->setCurrentGLContext(); -+#elif wxCHECK_VERSION(2, 9, 3) - - #elif wxCHECK_VERSION(2, 9, 1) - glCanvas->setCurrentGLContext(); -@@ -756,8 +761,8 @@ void MainWindow::onClose(wxCloseEvent &event){ - delete timer; - timer = NULL; - -- delete model; -- model = NULL; -+ //delete model; -+ //model = NULL; - - delete renderer; - renderer = NULL; -@@ -2027,7 +2032,7 @@ GlCanvas::GlCanvas(MainWindow * mainWindow, int *args) - } - - GlCanvas::~GlCanvas() { -- delete this->context; -+ if(this->context) delete this->context; - this->context = NULL; - } - -@@ -2037,11 +2042,13 @@ void GlCanvas::setCurrentGLContext() { - #if wxCHECK_VERSION(2, 9, 1) - if(this->context == NULL) { - this->context = new wxGLContext(this); -+ //printf("Set ctx [%p]\n",this->context); - } - #endif - //printf("Set ctx [%p]\n",this->context); - if(this->context) { - wxGLCanvas::SetCurrent(*this->context); -+ //printf("Set ctx2 [%p]\n",this->context); - } - #else - this->SetCurrent(); -diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h -index d22020d..e8142b8 100644 ---- a/source/g3d_viewer/main.h -+++ b/source/g3d_viewer/main.h -@@ -201,6 +201,7 @@ public: - void onKeyDown(wxKeyEvent &event); - void setCurrentGLContext(); - -+ wxGLContext * getCtx() { return context; } - private: - MainWindow *mainWindow; - wxGLContext *context; -diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp -index 9b2dc57..e9c9b7c 100644 ---- a/source/glest_map_editor/main.cpp -+++ b/source/glest_map_editor/main.cpp -@@ -138,12 +138,12 @@ END_EVENT_TABLE() - - void MainWindow::init(string fname) { - #if wxCHECK_VERSION(2, 9, 3) -- glCanvas->setCurrentGLContext(); -+ //glCanvas->setCurrentGLContext(); - //printf("setcurrent #1\n"); - #elif wxCHECK_VERSION(2, 9, 1) - - #else -- glCanvas->SetCurrent(); -+ //glCanvas->SetCurrent(); - //printf("setcurrent #2\n"); - #endif - -@@ -638,11 +638,17 @@ void MainWindow::onPaint(wxPaintEvent &event) { - return; - } - --#if wxCHECK_VERSION(2, 9, 3) -+//#if wxCHECK_VERSION(2, 9, 3) - --#elif wxCHECK_VERSION(2, 9, 1) -+//#elif wxCHECK_VERSION(2, 9, 1) -+// glCanvas->setCurrentGLContext(); -+//#endif -+ -+ //static bool contextSet = false; -+ //if(contextSet == false) { -+ // contextSet = true; - glCanvas->setCurrentGLContext(); --#endif -+ //} - - if(lastPaintEvent.getMillis() < 30) { - sleep(1); -@@ -1579,6 +1585,10 @@ bool App::OnInit() { - SystemFlags::VERBOSE_MODE_ENABLED = false; - SystemFlags::ENABLE_THREADED_LOGGING = false; - -+#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER) -+ printf("Using wxWidgets version [%d.%d.%d.%d]\n",wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER); -+#endif -+ - string fileparam; - if(argc==2){ - if(argv[1][0]=='-') { // any flag gives help and exits program. -diff --git a/source/shared_lib/sources/graphics/model.cpp b/source/shared_lib/sources/graphics/model.cpp -index e3bf3cf..84becdb 100644 ---- a/source/shared_lib/sources/graphics/model.cpp -+++ b/source/shared_lib/sources/graphics/model.cpp -@@ -1099,7 +1099,7 @@ Model::Model() { - } - - Model::~Model() { -- delete [] meshes; -+ if(meshes) delete [] meshes; - meshes = NULL; - } - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
