On Sat, Jun 28, 2014 at 09:07:19PM +0200, Andreas Tille wrote:
> On Sat, Jun 28, 2014 at 06:40:41AM +0100, Olly Betts wrote:
> > I've attached a patch of where I got to above, plus the versioned BD.
> > This patch is against your SVN repo.
>
> Ahh, this mail came without any patch ...
Sigh, really attached now.
Cheers,
Olly
Index: control
===================================================================
--- control (revision 17314)
+++ control (working copy)
@@ -22,7 +22,7 @@
,libvtk5-dev (>= 5.6.0)
,libwrap0
,libwrap0-dev
- ,libwxgtk3.0-dev
+ ,libwxgtk3.0-dev (>= 3.0.1-2~)
,libxml2-dev
# upstream build system also checking for presence of the following packages
# that apparently are not used:
Index: patches/fix-wx.patch
===================================================================
--- patches/fix-wx.patch (revision 17314)
+++ patches/fix-wx.patch (working copy)
@@ -1,4 +1,4 @@
-Last-Update: Tue, 17 Jun 2014 08:20:07 +0200
+Last-Update: 2014-06-21
Forwarded: no
Author: Dmitry Smirnov <only...@member.fsf.org>
Description: fix FTBFS due to missing "-lwx_gtk2u_html-2.8"
@@ -12,7 +12,7 @@
IF(NOT USE_CUSTOM_WX)
MESSAGE("Using system wxWidgets")
-FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base gl net xml aui adv richtext xrc REQUIRED)
-+FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html gl net xml aui adv richtext xrc REQUIRED)
++FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html propgrid gl net xml aui adv richtext xrc REQUIRED)
ELSE()
MESSAGE("Using custom wxWidgets")
SET_CUSTOM_wxWidgets_PACKAGE()
Index: patches/series
===================================================================
--- patches/series (revision 17314)
+++ patches/series (working copy)
@@ -1,2 +1,3 @@
fix-wx.patch
unbundle-libjsoncpp.patch
+wx3.0-compat.patch
Index: patches/wx3.0-compat.patch
===================================================================
--- patches/wx3.0-compat.patch (revision 0)
+++ patches/wx3.0-compat.patch (working copy)
@@ -0,0 +1,19 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: http://bugs.debian.org/749487
+Forwarded: no
+Last-Update: 2014-06-21
+
+--- ginkgocadx-3.6.1.1367.34+dfsg.orig/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp
++++ ginkgocadx-3.6.1.1367.34+dfsg/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp
+@@ -148,7 +148,9 @@ wxWindow* wxGetTopLevelParent(wxWindow *
+ # include "gdk/gdkprivate.h"
+ #if wxCHECK_VERSION(2, 8, 0)
+ #ifdef __WXGTK20__
+-#if wxCHECK_VERSION(2, 9, 0)
++#if wxCHECK_VERSION(3, 0, 0)
++#include <gtk/gtk.h>
++#elif wxCHECK_VERSION(2, 9, 0)
+ #include <gtk/gtk.h>
+ #include <wx/gtk/private/win_gtk.h>
+ #else
