From 6be5ad76fca7ade9a13e6c8de3bc54ba0379ef3f Mon Sep 17 00:00:00 2001
From: Holger Jaekel <holger.jaekel@gmx.de>
Date: Sun, 16 Jun 2019 16:10:24 +0200
Subject: testing/mapserver: upgrade to 7.4.0

---
 testing/mapserver/APKBUILD                  | 34 +++++++++++++++++++++--------
 testing/mapserver/fix-build-new-proj4.patch | 13 -----------
 2 files changed, 25 insertions(+), 22 deletions(-)
 delete mode 100644 testing/mapserver/fix-build-new-proj4.patch

(limited to 'testing/mapserver')

diff --git a/testing/mapserver/APKBUILD b/testing/mapserver/APKBUILD
index c143236097..62fec018e3 100644
--- a/testing/mapserver/APKBUILD
+++ b/testing/mapserver/APKBUILD
@@ -1,18 +1,35 @@
 # Contributor: Bjoern Schilberg <bjoern@intevation.de>
 # Maintainer: Bjoern Schilberg <bjoern@intevation.de>
 pkgname=mapserver
-pkgver=7.2.1
+pkgver=7.4.0
 pkgrel=0
 pkgdesc="MapServer is CGI-based platform for publishing spatial data and interactive mapping applications to the web."
 url="http://mapserver.org/"
 arch="x86_64"
 license="MIT"
-depends="geos gdal proj4 cairo curl fcgi freetype libjpeg libpng libxml2 libpq giflib protobuf-c"
-depends_dev="cmake postgresql-dev geos-dev gdal-dev jpeg-dev giflib-dev libxml2-dev proj4-dev fcgi-dev curl-dev freetype-dev cairo-dev protobuf-c-dev"
-makedepends="$depends_dev"
-subpackages="$pkgname-dev"
-source="http://download.osgeo.org/mapserver/$pkgname-$pkgver.tar.gz
-	fix-build-new-proj4.patch
+depends_dev="
+	cmake
+	postgresql-dev
+	geos-dev
+	gdal-dev
+	jpeg-dev
+	giflib-dev
+	libxml2-dev
+	proj-dev
+	fcgi-dev
+	curl-dev
+	freetype-dev
+	cairo-dev
+	protobuf-c-dev
+	"
+makedepends="
+	$depends_dev
+	"
+subpackages="
+	$pkgname-dev
+	"
+source="
+	http://download.osgeo.org/mapserver/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
@@ -51,5 +68,4 @@ package() {
 	chmod -x "$pkgdir"/usr/include/mapserver/*.h
 }
 
-sha512sums="8622488c47ee1f7c245566aa3ceb2d91074742e9acb8deaa0044f2b6a9fd71e5eaa65b388997ab37f974cc6f7272f40e41d84ef6ad3449976229bbe01e6289a4  mapserver-7.2.1.tar.gz
-ab5c60a17d0266df76b8118b383a127268b5944b3dcc6797240add8029e24dc2a330a4f34f77b5f2dcd7147b73e092ddbf5bdb24661df0f09f6cce182f5b081c  fix-build-new-proj4.patch"
+sha512sums="9dacd9a44cff1e109aaf4e036372835c096bd139071f6f2a834702980089b10453bd3fad0a7c2b371ca76c9c8d5e5c6b2e9ffd28780fe5f09347601601ba5a2f  mapserver-7.4.0.tar.gz"
diff --git a/testing/mapserver/fix-build-new-proj4.patch b/testing/mapserver/fix-build-new-proj4.patch
deleted file mode 100644
index 55b7a80647..0000000000
--- a/testing/mapserver/fix-build-new-proj4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mapproject.h b/mapproject.h
-index c296677..4695e90 100644
---- a/mapproject.h
-+++ b/mapproject.h
-@@ -38,6 +38,7 @@ extern "C" {
- #endif
- 
- #ifdef USE_PROJ
-+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
- #  include <proj_api.h>
- #if PJ_VERSION >= 470 && PJ_VERSION < 480
-    void pj_clear_initcache();
-
-- 
cgit v1.2.3