[med-svn] r17326 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-06-29 09:19:34 +0000 (Sun, 29 Jun 2014)
New Revision: 17326

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
   trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/series
Log:
Upload with linling against wx3.0


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2014-06-29 08:04:56 UTC (rev 17325)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2014-06-29 09:19:34 UTC (rev 17326)
@@ -1,7 +1,8 @@
-ginkgocadx (3.6.1.1367.34+dfsg-1) UNRELEASED; urgency=medium
+ginkgocadx (3.6.1.1367.34+dfsg-1) unstable; urgency=medium
 
   * New upstream version (adapt patches)
-  * Build-Depend: libwxgtk3.0-dev
+  * Build-Depend: libwxgtk3.0-dev (>= 3.0.1-2~ due to a gcc bug) and
+    Patch from Olly Betts (thanks to Olly for his help)
     Closes: #749487
 
  -- Andreas Tille <tille at debian.org>  Tue, 17 Jun 2014 08:20:07 +0200

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2014-06-29 08:04:56 UTC (rev 17325)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2014-06-29 09:19:34 UTC (rev 17326)
@@ -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:

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch	2014-06-29 08:04:56 UTC (rev 17325)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch	2014-06-29 09:19:34 UTC (rev 17326)
@@ -1,4 +1,4 @@
-Last-Update: Tue, 17 Jun 2014 08:20:07 +0200
+Last-Update: 2014-06-21
 Forwarded: no
 Author: Dmitry Smirnov <onlyjob at 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()

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	2014-06-29 08:04:56 UTC (rev 17325)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2014-06-29 09:19:34 UTC (rev 17326)
@@ -1,2 +1,3 @@
 fix-wx.patch
 unbundle-libjsoncpp.patch
+wx3.0-compat.patch

Added: trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch	2014-06-29 09:19:34 UTC (rev 17326)
@@ -0,0 +1,19 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly at 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