Date: Wed, 16 May 2018 13:12:09 +0200
From: Bjoern Schilberg <bjoern@intevation.de>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH] testing/postgis: upgrade to 2.4.4. json-c-0.13.patch not needed anymore, see https://github.com/postgis/postgis/pull/173
Message-ID: <20180516111208.GA26461@intevation.de>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.9.5 (2018-04-13)

---
 testing/postgis/APKBUILD          | 10 ++++------
 testing/postgis/json-c-0.13.patch | 34 ----------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 testing/postgis/json-c-0.13.patch

diff --git a/testing/postgis/APKBUILD b/testing/postgis/APKBUILD
index cc38fbbb41..a71d54621b 100644
--- a/testing/postgis/APKBUILD
+++ b/testing/postgis/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bjoern Schilberg <bjoern@intevation.de>
 # Maintainer: Bjoern Schilberg <bjoern@intevation.de>
 pkgname=postgis
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.4.4
+pkgrel=0
 pkgdesc="PostGIS is a spatial database extender for PostgreSQL object-relational database."
 url="http://postgis.net"
 # geos test fails on other archs
@@ -12,8 +12,7 @@ depends="postgresql perl"
 makedepends="postgresql-dev geos-dev gdal-dev libxml2-dev proj4-dev perl-dev
 	json-c-dev pcre-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz
-	json-c-0.13.patch"
+source="http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
@@ -37,5 +36,4 @@ package() {
 	chmod -x "$pkgdir"/usr/include/*.h
 }
 
-sha512sums="a0baff97f15a02dfd466c38923a8fad81375fa06423c51ccaf6fb97a824a4010b12f152afd3f82ce9089983816b918d67c25de8fdabca27da71fb64309d01fc8  postgis-2.4.1.tar.gz
-f82ed289b83dfb6d5162e5b05607354acf793a8f53940bbefcf9f77b8337f585ae7f07a88ad62afed0f78720f06d8a0c4fb4aebf23244a7effc35fd76173d559  json-c-0.13.patch"
+sha512sums="3cb38ee24dad72a66677cb210ad5f07b0a97411664ede582a5cdbc0ca2d72573db4e9121b6af2eab9cdee6a41122c3f5c59e618df4ee028a3cae7ee35d8670f2  postgis-2.4.4.tar.gz"
diff --git a/testing/postgis/json-c-0.13.patch b/testing/postgis/json-c-0.13.patch
deleted file mode 100644
index b8f3ec717e..0000000000
--- a/testing/postgis/json-c-0.13.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 */
-- 
2.15.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---