[packages/spatialite_gis] - fix building with wxWidgets 3.0 - rel 4

[baggins]

commit db6e6d1110e24d85efb23b875e7d76d5a986ced4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 18 19:29:52 2014 +0100

    - fix building with wxWidgets 3.0
    - rel 4

 spatialite_gis.spec |  5 ++++-
 wxWidgets3.patch    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/spatialite_gis.spec b/spatialite_gis.spec
index dfea69d..a12cb71 100644
--- a/spatialite_gis.spec
+++ b/spatialite_gis.spec
@@ -2,11 +2,12 @@ Summary:	Minimalistic GIS tool built on top of SpatiaLite and RasterLite
 Summary(pl.UTF-8):	Minimalistyczne narzędzie GIS stworzone w oparciu o SpatiaLite i RasterLite
 Name:		spatialite_gis
 Version:	1.0.0c
-Release:	3
+Release:	4
 License:	GPL v3+
 Group:		Applications/Databases
 Source0:	http://www.gaia-gis.it/gaia-sins/spatialite-gis-sources/%{name}-%{version}.tar.gz
 # Source0-md5:	81de8d7f3e20038bd2ec721edc02dfb0
+Patch0:		wxWidgets3.patch
 URL:		https://www.gaia-gis.it/fossil/spatialite_gis
 BuildRequires:	freexl-devel
 BuildRequires:	geos-devel
@@ -34,11 +35,13 @@ RasterLite.
 
 %prep
 %setup -q
+%patch0 -p1
 
 mkdir wx-bin
 ln -sf /usr/bin/wx-gtk2-unicode-config wx-bin/wx-config
 
 %build
+%{__autoconf}
 # configure refers to wx-config with no option to override
 PATH=$(pwd)/wx-bin:$PATH
 %configure
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..72008e2
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,44 @@
+diff -ur spatialite_gis-1.0.0c/Classdef.h spatialite_gis-1.0.0c.wx3/Classdef.h
+--- spatialite_gis-1.0.0c/Classdef.h	2011-12-28 18:37:48.000000000 +0100
++++ spatialite_gis-1.0.0c.wx3/Classdef.h	2014-01-18 19:14:31.518720315 +0100
+@@ -30,6 +30,7 @@
+ #include "wx/spinctrl.h"
+ #include "wx/listctrl.h"
+ #include "wx/grid.h"
++#include <wx/graphics.h>
+ 
+ #ifdef SPATIALITE_AMALGAMATION
+ #include <spatialite/sqlite3.h>
+diff -ur spatialite_gis-1.0.0c/configure.ac spatialite_gis-1.0.0c.wx3/configure.ac
+--- spatialite_gis-1.0.0c/configure.ac	2011-12-28 18:37:48.000000000 +0100
++++ spatialite_gis-1.0.0c.wx3/configure.ac	2014-01-18 19:26:11.855381913 +0100
+@@ -21,7 +21,7 @@
+ 
+ CXXFLAGS="$(wx-config --cxxflags)"
+ AM_CXXFLAGS="$(wx-config --cxxflags)"
+-WX_LIBS="$(wx-config --libs)"
++WX_LIBS="$(wx-config --libs) -lwx_gtk2u_aui-3.0"
+ AC_SUBST(WX_LIBS)
+ 
+ # Checks for header files.
+diff -ur spatialite_gis-1.0.0c/MapView.cpp spatialite_gis-1.0.0c.wx3/MapView.cpp
+--- spatialite_gis-1.0.0c/MapView.cpp	2011-12-28 18:37:48.000000000 +0100
++++ spatialite_gis-1.0.0c.wx3/MapView.cpp	2014-01-18 19:22:52.105383358 +0100
+@@ -1160,7 +1160,7 @@
+       if (layer->GetType() == VECTOR_LAYER)
+         {
+           if (layer->GetTableName() == active->GetTableName() &&
+-              layer->GetGeometryColumn() && active->GetGeometryColumn())
++              !layer->GetGeometryColumn().IsEmpty() && !active->GetGeometryColumn().IsEmpty())
+             {
+               // OK: performing Identify
+               Identify(layer, IdentifyMouseX, IdentifyMouseY);
+@@ -1789,7 +1789,7 @@
+           if (layer->GetType() == VECTOR_LAYER)
+             {
+               if (layer->GetTableName() == active->GetTableName() &&
+-                  layer->GetGeometryColumn() && active->GetGeometryColumn())
++                  !layer->GetGeometryColumn().IsEmpty() && !active->GetGeometryColumn().IsEmpty())
+                 {
+                   // OK: performing Identify
+                   Identify(layer, MouseIdentifyX, MouseIdentifyY);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/spatialite_gis.git/commitdiff/db6e6d1110e24d85efb23b875e7d76d5a986ced4