diff options
| -rw-r--r-- | testing/postgis/APKBUILD | 11 | ||||
| -rw-r--r-- | testing/postgis/json-c-0.13.patch | 34 |
2 files changed, 41 insertions, 4 deletions
diff --git a/testing/postgis/APKBUILD b/testing/postgis/APKBUILD index 3bde0f3051..e9cf765759 100644 --- a/testing/postgis/APKBUILD +++ b/testing/postgis/APKBUILD @@ -2,15 +2,17 @@ # Maintainer: Bjoern Schilberg <bjoern@intevation.de> pkgname=postgis pkgver=2.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="PostGIS is a spatial database extender for PostgreSQL object-relational database." url="http://postgis.net" arch="x86_64" license="GPL-2.0-or-later" depends="postgresql perl" -makedepends="postgresql-dev geos-dev gdal-dev libxml2-dev proj4-dev perl-dev" +makedepends="postgresql-dev geos-dev gdal-dev libxml2-dev proj4-dev perl-dev + json-c-dev pcre-dev" subpackages="$pkgname-dev" -source="http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz" +source="http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz + json-c-0.13.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -34,4 +36,5 @@ package() { chmod -x "$pkgdir"/usr/include/*.h } -sha512sums="a0baff97f15a02dfd466c38923a8fad81375fa06423c51ccaf6fb97a824a4010b12f152afd3f82ce9089983816b918d67c25de8fdabca27da71fb64309d01fc8 postgis-2.4.1.tar.gz" +sha512sums="a0baff97f15a02dfd466c38923a8fad81375fa06423c51ccaf6fb97a824a4010b12f152afd3f82ce9089983816b918d67c25de8fdabca27da71fb64309d01fc8 postgis-2.4.1.tar.gz +f82ed289b83dfb6d5162e5b05607354acf793a8f53940bbefcf9f77b8337f585ae7f07a88ad62afed0f78720f06d8a0c4fb4aebf23244a7effc35fd76173d559 json-c-0.13.patch" diff --git a/testing/postgis/json-c-0.13.patch b/testing/postgis/json-c-0.13.patch new file mode 100644 index 0000000000..b8f3ec717e --- /dev/null +++ b/testing/postgis/json-c-0.13.patch @@ -0,0 +1,34 @@ +From a079dba76b209b788e9ced3641e2289b0820216c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> +Date: Fri, 15 Dec 2017 13:35:40 +0100 +Subject: [PATCH] geojson: Do not include private header for json-c >= 0.13 + +Patch-Source: https://src.fedoraproject.org/rpms/postgis/blob/master/f/postgis-2.4.1_json-c_013.patch +--- + liblwgeom/lwin_geojson.c | 6 ++++++ + 1 file changed, 6 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 */ |