From 052dba594004442d0d135fc2c85551682a33bb73 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 12 May 2019 16:26:42 +0200
Subject: [PATCH] merkaartor: fix build with proj-6.0.0 and gdal-3.0.0

---
 srcpkgs/merkaartor/patches/gdal3.patch | 11 +++++++++++
 srcpkgs/merkaartor/template            |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/merkaartor/patches/gdal3.patch

diff --git a/srcpkgs/merkaartor/patches/gdal3.patch b/srcpkgs/merkaartor/patches/gdal3.patch
new file mode 100644
index 00000000000..f464068022e
--- /dev/null
+++ b/srcpkgs/merkaartor/patches/gdal3.patch
@@ -0,0 +1,11 @@
+--- src/ImportExport/ImportExportGdal.h	2016-09-06 00:29:45.000000000 +0200
++++ -	2019-05-12 16:24:43.493161590 +0200
+@@ -19,7 +19,7 @@
+ #include <gdal_priv.h>
+ #include <gdal_version.h>
+ 
+-#if GDAL_VERSION_MAJOR == 2
++#if GDAL_VERSION_MAJOR == 2 || GDAL_VERSION_MAJOR == 3
+ #define GDAL2
+ #endif
+ 
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 2c03a372c3d..f049eb6751f 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -13,6 +13,9 @@ homepage="http://merkaartor.be"
 distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz"
 checksum=d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947
 
+CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+CXXFLAGS="${CFLAGS}"
+
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel qt5-webkit-devel"
 fi