Update version 2.1.0-beta0

3 files changed, 20 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4b657d16ae8..04de5fa2f215 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = spatialite-gui-devel
 	pkgdesc = spatialite-gui is an open source Graphical User Interface (GUI) tool supporting SpatiaLite. Development version
-	pkgver = 2.0.0
-	pkgrel = 3
+	pkgver = 2.1.0
+	pkgrel = 1
 	url = https://www.gaia-gis.it/fossil/spatialite_gui/index
 	arch = x86_64
 	arch = i686
 	license = GPLv3
-	depends = libspatialite>=4.1.1-3
+	depends = libspatialite-devel
 	depends = librasterlite2-devel
+	depends = virtualpg2-devel
 	depends = wxgtk
-	depends = openjpeg2=2.1.2
+	depends = openjpeg2
 	conflicts = spatialite-gui
 	replaces = spatialite-gui
-	source = http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-2.0.0-devel.tar.gz
-	source = patch01_pointer.patch
-	md5sums = 2ad2936e34923029b9b6cd94c428066c
-	md5sums = d3ae41d66f29d838089221dc793ee95e
+	source = http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-2.1.0-beta0.tar.gz
+	md5sums = f06289fa547e596d9c01c23c5e1722ec
 
 pkgname = spatialite-gui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index fa90b301f639..8b64e64a4c81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,34 @@
 # Contributor: snork
 
 pkgname=spatialite-gui-devel
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.1.0
+_pkgver=2.1.0-beta0
+pkgrel=1
 pkgdesc="spatialite-gui is an open source Graphical User Interface (GUI) 
 tool supporting SpatiaLite. Development version"
 url="https://www.gaia-gis.it/fossil/spatialite_gui/index"
 arch=('x86_64' 'i686')
 license=('GPLv3')
-depends=('libspatialite>=4.1.1-3' 'librasterlite2-devel' 'wxgtk' 'openjpeg2=2.1.2')
+depends=('libspatialite-devel' 'librasterlite2-devel' 'virtualpg2-devel' 'wxgtk' 'openjpeg2')
 conflicts=(spatialite-gui)
 replaces=(spatialite-gui)
-source=("http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${pkgver}-devel.tar.gz"
-		patch01_pointer.patch)
+source=("http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${_pkgver}.tar.gz")
 _pkgname=spatialite_gui
 
-md5sums=('2ad2936e34923029b9b6cd94c428066c'
-         'd3ae41d66f29d838089221dc793ee95e')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}-devel"
-  patch -p0 < ../patch01_pointer.patch
-}
+md5sums=('f06289fa547e596d9c01c23c5e1722ec')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}-devel"
+  cd "${srcdir}/${_pkgname}-${_pkgver}"
+
+  ./configure --prefix="/usr" \
+  CXXFLAGS="`wx-config --version=3.0 --cxxflags`" \
+  LIBS="`wx-config --version=3.0 --libs`"
 
-  ./configure --prefix="/usr"
-  make -j3
+  make -j4
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}-devel"
+  cd "${srcdir}/${_pkgname}-${_pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 gnome_resource/spatialite-gui.desktop "${pkgdir}"/usr/share/applications/spatialite-gui.desktop
   install -D -m644 gnome_resource/spatialite-gui.png "${pkgdir}"/usr/share/pixmaps/spatialite-gui.png
diff --git a/patch01_pointer.patch b/patch01_pointer.patch
deleted file mode 100644
index 943561141a75..000000000000
--- a/patch01_pointer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ResultSetView.cpp
-+++ ResultSetView.new.cpp
-@@ -494,7 +494,7 @@
- {
- // strips any leading white-space
-   const char *p = dirty;
--  while (p != '\0')
-+  while (*p != '\0')
-     {
-       if (*p == ' ')
-         {