From 0a8a7c16f6079c19bd7048a2560e714b40de63e2 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Fri, 3 Jan 2020 23:51:02 -0600 Subject: [PATCH] postgis: update to 3.0.0. --- .../patches/postgis-2.5.3-PROTOCC_VERSION.patch | 13 ------------- srcpkgs/postgis/template | 9 +++++---- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch diff --git a/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch b/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch deleted file mode 100644 index b1105fe58e2..00000000000 --- a/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch +++ /dev/null @@ -1,13 +0,0 @@ -PROTOCC_VERSION is not defined as variable in this Makefile - ---- postgis/Makefile.in.ORIG 2019-08-11 07:59:31.000000000 +0200 -+++ postgis/Makefile.in 2019-09-03 06:11:57.430733390 +0200 -@@ -206,7 +206,7 @@ - ifeq (@HAVE_PROTOBUF@,yes) - lwgeom_out_mvt.o: vector_tile.pb-c.h - mvt.o: vector_tile.pb-c.h --ifeq ($(shell expr $(PROTOCC_VERSION) ">=" 10100),1) -+ifeq ($(shell expr @PROTOCC_VERSION@ ">=" 10100),1) - lwgeom_out_geobuf.o: geobuf.pb-c.h - geobuf.o: geobuf.pb-c.h - endif diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template index 9fc896adf17..a247e443e7e 100644 --- a/srcpkgs/postgis/template +++ b/srcpkgs/postgis/template @@ -1,12 +1,13 @@ # Template file for 'postgis' pkgname=postgis -version=2.5.3 -revision=2 +version=3.0.0 +revision=1 build_style=gnu-configure configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr --with-projdir=${XBPS_CROSS_BASE}/usr --with-jsondir=${XBPS_CROSS_BASE}/usr - --with-protobufdir=${XBPS_CROSS_BASE}/usr" + --with-protobufdir=${XBPS_CROSS_BASE}/usr + --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config" hostmakedepends="automake libtool perl pkg-config geos libgdal-tools postgresql-libs-devel" makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel proj-devel protobuf-c-devel pcre-devel json-c-devel" @@ -16,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://postgis.net/" changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a +checksum=c06fd2cd5cea0119106ffe17a7235d893c2bbe6f4b63c8617c767630973ba594 nocross="FIXME: Cannot run test program to determine PROJ version" pre_configure() {