Tue Jun 3 03:28:08 UTC 2014

2 files changed, 91 insertions, 2 deletions

diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 3610ec278..23d749363 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110915 2014-05-09 14:55:04Z andyrtr $
+# $Id: PKGBUILD 112475 2014-06-02 16:15:40Z anatolik $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
@@ -18,14 +18,19 @@ optdepends=('postgresql: postgresql database support'
             'swig:  perl binding support')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        fix_json_012.patch
         gdal-1.5.1-python-install.patch)
 sha256sums=('989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe'
+            '0ef2a20e9a0e86f85eab9a4a1e5caf7364f1d547deed6f2249fe542d4d2881f4'
             '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 prepare() {
   cd "${srcdir}/$pkgname-$pkgver"
   patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch"
 
+  # Fix compilation failure related to recent json-c changes. FS#40584
+  patch -Np0 -i "${srcdir}/fix_json_012.patch"
+
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure
   for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
diff --git a/community/gdal/fix_json_012.patch b/community/gdal/fix_json_012.patch
new file mode 100644
index 000000000..5317a6f93
--- /dev/null
+++ b/community/gdal/fix_json_012.patch
@@ -0,0 +1,84 @@
+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);