Revision 1886 - Linux

[Der Meister]

Revision 1886 needs a few patches to work on Linux.

First, a missing include:

Code

Index: src/sdk/configurationpanel.h
===================================================================
--- src/sdk/configurationpanel.h        (revision 1886)
+++ src/sdk/configurationpanel.h        (working copy)
@@ -1,9 +1,10 @@
-#ifndef CONFIGURATIONPANEL_H
-#define CONFIGURATIONPANEL_H
+#ifndef CONFIGURATIONPANEL_H
+#define CONFIGURATIONPANEL_H
 
 #include "settings.h"
 #include <wx/dialog.h>
 #include <wx/string.h>
+#include <wx/panel.h>
 
 class wxButton;

(You can ignore the first lines - this must have been an issue with line-endings.)

Second, an outdated Makefile.am:

Code

Index: src/plugins/debuggergdb/Makefile.am
===================================================================
--- src/plugins/debuggergdb/Makefile.am (revision 1886)
+++ src/plugins/debuggergdb/Makefile.am (working copy)
@@ -2,7 +2,8 @@
 
 INCLUDES = $(WX_CXXFLAGS) \
                -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
+               -I$(top_srcdir)/src/sdk/wxscintilla/include \
+               -I$(top_srcdir)/src/sdk/as/include
 
 libdir = $(pkgdatadir)/plugins

And last but not least: A patch that fixes a segfault while opening the environment-settings-dialog:

Code

Index: src/src/environmentsettingsdlg.cpp
===================================================================
--- src/src/environmentsettingsdlg.cpp  (revision 1886)
+++ src/src/environmentsettingsdlg.cpp  (working copy)
@@ -120,7 +120,6 @@
     XRCCTRL(*this, "chkDDE", wxCheckBox)->Enable(false);
     XRCCTRL(*this, "chkAssociations", wxCheckBox)->Enable(false);
     XRCCTRL(*this, "btnSetAssocs", wxButton)->Enable(false);
-    XRCCTRL(*this, "txtBatchBuildsCmdLine", wxTextCtrl)->Enable(false);
 #endif
 
     // add all plugins configuration panels

("txtBatchBuildsCmdLine" does not exist any more in this dialog, thus this line dereferences a zero-pointer => segfault.)

[mandrav]

Fixed in revision 1887. Thanks.