[arch-commits] Commit in postgis/trunk (PKGBUILD json-0.13-compatibility.patch)

[Jelle van der Waa]

    Date: Wednesday, December 27, 2017 @ 11:13:50
  Author: jelle
Revision: 276210

upgpkg: postgis 2.4.2-1

json-c 0.13 rebuild

Added:
  postgis/trunk/json-0.13-compatibility.patch
Modified:
  postgis/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   11 ++++++++--
 json-0.13-compatibility.patch |   44 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-27 10:59:30 UTC (rev 276209)
+++ PKGBUILD	2017-12-27 11:13:50 UTC (rev 276210)
@@ -13,9 +13,16 @@
 depends=('postgresql' 'gdal' 'json-c' 'proj' 'protobuf-c')
 changelog=$pkgname.changelog
 options=('!makeflags')
-source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9')
+source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz
+        json-0.13-compatibility.patch)
+sha256sums=('23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9'
+            'a7d3a6005cf776d69dc6df0fc4f31a366049487fcde7939a1849e724d0d78c36')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i $srcdir/json-0.13-compatibility.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: json-0.13-compatibility.patch
===================================================================
--- json-0.13-compatibility.patch	                        (rev 0)
+++ json-0.13-compatibility.patch	2017-12-27 11:13:50 UTC (rev 276210)
@@ -0,0 +1,44 @@
+From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001
+From: Darafei Praliaskouski <me at komzpa.net>
+Date: Sat, 16 Dec 2017 10:40:06 +0000
+Subject: [PATCH] Do not include private header for json-c >= 0.13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Patch by Björn Esser
+
+Closes #3942
+Closes https://github.com/postgis/postgis/pull/173
+
+
+
+git-svn-id: http://svn.osgeo.org/postgis/trunk@16155 b70326c6-7e19-0410-871a-916f4a2858ee
+---
+ liblwgeom/lwin_geojson.c | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
+index 749d03374..ef907ee79 100644
+--- a/liblwgeom/lwin_geojson.c
++++ b/liblwgeom/lwin_geojson.c
+@@ -31,13 +31,19 @@
+ 
+ #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
+ 
++#define JSON_C_VERSION_013 (13 << 8)
++
+ #ifdef HAVE_LIBJSON_C
+ #include <json-c/json.h>
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include <json-c/json_object_private.h>
++#endif
+ #else
+ #include <json/json.h>
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include <json/json_object_private.h>
+ #endif
++#endif
+ 
+ #ifndef JSON_C_VERSION
+ /* Adds support for libjson < 0.10 */