mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/postgis: upgrade to 2.4.4

Browse Source 
json-c-0.13.patch not needed anymore, see https://github.com/postgis/postgis/pull/173
This commit is contained in:
Bjoern Schilberg 2018-05-16 13:12:09 +02:00 committed by Leonardo Arena
parent ba105b9ed6
commit 9f40ebb2e1
2 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/postgis/APKBUILD
View File

@ -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"

34
testing/postgis/json-c-0.13.patch
View File

@ -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 */