[spatialite-gui] 01/03: Update to use wxWidgets 3.0.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository spatialite-gui.

commit 5531f801a8e5191cf7f47caa6f8f3030eacdc740
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu May 29 14:04:14 2014 +0200

    Update to use wxWidgets 3.0.
---
 debian/changelog                     |  8 ++++++++
 debian/control                       |  3 +--
 debian/patches/04-wx3.0-compat.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d507859..c948d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spatialite-gui (1.7.1-4) UNRELEASED; urgency=medium
+
+  [ Olly Betts ]
+  * Update to use wxWidgets 3.0.
+    (closes: #748085)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 29 May 2014 13:58:36 +0200
+
 spatialite-gui (1.7.1-3) unstable; urgency=low
 
   * Add gbp.conf to use pristine-tar by default.
diff --git a/debian/control b/debian/control
index 41b5e7a..cc168e9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Build-Depends: debhelper (>= 9~),
                dh-autoreconf,
                pkg-config,
                wx-common,
-               wx2.8-headers,
-               libwxgtk2.8-dev,
+               libwxgtk3.0-dev,
                libspatialite-dev (>= 4.1.1-5~),
                libproj-dev,
                libgeos-dev,
diff --git a/debian/patches/04-wx3.0-compat.patch b/debian/patches/04-wx3.0-compat.patch
new file mode 100644
index 0000000..d7b9afe
--- /dev/null
+++ b/debian/patches/04-wx3.0-compat.patch
@@ -0,0 +1,26 @@
+Description: Fix to build with wxwidgets 3.0
+Author: Olly Betts <olly at survex.com>
+Last-Update: 2014-05-01
+
+--- a/configure
++++ b/configure
+@@ -15543,7 +15543,7 @@ if test x$WX_CONFIG == xnot_found; then
+ fi
+ CXXFLAGS="$(wx-config --cxxflags)"
+ AM_CXXFLAGS="$(wx-config --cxxflags)"
+-WX_LIBS="$(wx-config --libs)"
++WX_LIBS="$(wx-config --libs std,aui)"
+ 
+ 
+ # Checks for header files.
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ if test x$WX_CONFIG == xnot_found; then
+ fi
+ CXXFLAGS="$(wx-config --cxxflags)"
+ AM_CXXFLAGS="$(wx-config --cxxflags)"
+-WX_LIBS="$(wx-config --libs)"
++WX_LIBS="$(wx-config --libs std,aui)"
+ AC_SUBST(WX_LIBS)
+ 
+ # Checks for header files.
diff --git a/debian/patches/series b/debian/patches/series
index b8c0f86..1e72a8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-fix_binary_name.patch
 02-fix_typos.patch
 03-link-sqlite3.patch
+04-wx3.0-compat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git