gis/gdal: Updated for version 1.11.1.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

3 files changed, 5 insertions, 91 deletions

diff --git a/gis/gdal/gdal-json-c-012.patch b/gis/gdal/gdal-json-c-012.patch
deleted file mode 100644
index 5317a6f930..0000000000
--- a/gis/gdal/gdal-json-c-012.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp
-===================================================================
---- ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp	(revision 27044)
-+++ ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp	(revision 27267)
-@@ -1079,5 +1079,5 @@
-         CPLError( CE_Failure, CPLE_AppDefined,
-                     "JSON parsing error: %s (at offset %d)",
--                    json_tokener_errors[jstok->err], jstok->char_offset);
-+                    json_tokener_error_desc(jstok->err), jstok->char_offset);
- 
-         json_tokener_free(jstok);
-Index: ogr/ogrsf_frmts/gme/ogrgmejson.cpp
-===================================================================
---- ogr/ogrsf_frmts/gme/ogrgmejson.cpp	(revision 27208)
-+++ ogr/ogrsf_frmts/gme/ogrgmejson.cpp	(revision 27267)
-@@ -515,5 +515,5 @@
-             CPLError( CE_Failure, CPLE_AppDefined,
-                       "JSON parsing error: %s (at offset %d)",
--                          json_tokener_errors[jstok->err], jstok->char_offset);
-+                          json_tokener_error_desc(jstok->err), jstok->char_offset);
- 
-             json_tokener_free(jstok);
-Index: ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
-===================================================================
---- ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp	(revision 27044)
-+++ ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp	(revision 27267)
-@@ -78,5 +78,5 @@
-             CPLError( CE_Failure, CPLE_AppDefined,
-                       "GeoJSON parsing error: %s (at offset %d)",
--            	      json_tokener_errors[jstok->err], jstok->char_offset);
-+            	      json_tokener_error_desc(jstok->err), jstok->char_offset);
-             
-             json_tokener_free(jstok);
-@@ -1517,5 +1517,5 @@
-             CPLError( CE_Failure, CPLE_AppDefined,
-                       "GeoJSON parsing error: %s (at offset %d)",
--                      json_tokener_errors[jstok->err], jstok->char_offset);
-+                      json_tokener_error_desc(jstok->err), jstok->char_offset);
-             json_tokener_free(jstok);
-             return NULL;
-Index: ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
-===================================================================
---- ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp	(revision 27044)
-+++ ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp	(revision 27267)
-@@ -75,5 +75,5 @@
-             CPLError( CE_Failure, CPLE_AppDefined,
-                       "TopoJSON parsing error: %s (at offset %d)",
--            	      json_tokener_errors[jstok->err], jstok->char_offset);
-+            	      json_tokener_error_desc(jstok->err), jstok->char_offset);
-             
-             json_tokener_free(jstok);
-Index: ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
-===================================================================
---- ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp	(revision 27050)
-+++ ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp	(revision 27267)
-@@ -79,5 +79,5 @@
-             CPLError( CE_Failure, CPLE_AppDefined,
-                       "ESRIJSON parsing error: %s (at offset %d)",
--            	      json_tokener_errors[jstok->err], jstok->char_offset);
-+            	      json_tokener_error_desc(jstok->err), jstok->char_offset);
-             
-             json_tokener_free(jstok);
-Index: ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp
-===================================================================
---- ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp	(revision 27044)
-+++ ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp	(revision 27267)
-@@ -505,5 +505,5 @@
-         CPLError( CE_Failure, CPLE_AppDefined,
-                     "JSON parsing error: %s (at offset %d)",
--                    json_tokener_errors[jstok->err], jstok->char_offset);
-+                    json_tokener_error_desc(jstok->err), jstok->char_offset);
-         json_tokener_free(jstok);
-         CPLHTTPDestroyResult(psResult);
-Index: frmts/mbtiles/mbtilesdataset.cpp
-===================================================================
---- frmts/mbtiles/mbtilesdataset.cpp	(revision 27215)
-+++ frmts/mbtiles/mbtilesdataset.cpp	(revision 27267)
-@@ -619,5 +619,5 @@
-         CPLError( CE_Failure, CPLE_AppDefined,
-                     "JSON parsing error: %s (at offset %d)",
--                    json_tokener_errors[jstok->err],
-+                    json_tokener_error_desc(jstok->err),
-                     jstok->char_offset);
-         json_tokener_free(jstok);
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index b18d9d4109..04b9274acd 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -24,8 +24,8 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=${VERSION:-1.11.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.11.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -113,8 +113,6 @@ fi
 
 # Thanks to the people at Arch for this:
 patch -p0 <$CWD/gdal-python-install.patch
-# Another patch from Arch, supporting json-c >= 0.12 (also works with 0.11)
-patch -p0 <$CWD/gdal-json-c-012.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index d31c154442..2212a01170 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -1,8 +1,8 @@
 PRGNAM="gdal"
-VERSION="1.11.0"
+VERSION="1.11.1"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.xz"
-MD5SUM="31f2c4a7230b40e5fdc3cf12a100f96b"
+DOWNLOAD="http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.xz"
+MD5SUM="2e126d7c6605691d38f3e71b945f5c73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos proj"