Commit 5204b666 authored by Chaoting Liu's avatar Chaoting Liu

postgis: rebuild with new json-c, add compatibility patch

parent 06e33399
......@@ -2,15 +2,22 @@
pkgname=postgis
pkgver=2.4.3
pkgrel=1
pkgrel=2
pkgdesc="Adds support for geographic objects to PostgreSQL"
arch=('x86_64')
url="http://postgis.refractions.net/"
license=('GPL')
options=('!makeflags')
depends=('postgresql' 'gdal' 'json-c' 'proj' 'protobuf-c')
source=(http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz)
sha256sums=('ea5374c5db6b645ba5628ddcb08f71d3b3d90a464d366b4e1d20d5a268bde4b9')
source=(https://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz
json-0.13-compatibility.patch)
sha256sums=('ea5374c5db6b645ba5628ddcb08f71d3b3d90a464d366b4e1d20d5a268bde4b9'
'a7d3a6005cf776d69dc6df0fc4f31a366049487fcde7939a1849e724d0d78c36')
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 -i $srcdir/json-0.13-compatibility.patch
}
build() {
cd ${srcdir}/$pkgname-$pkgver
......
From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <me@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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment