merkaartor: fix build with proj-6.0.0 and gdal-3.0.0

This commit is contained in:
John 2019-05-12 16:26:42 +02:00
parent c3d58d9b95
commit 052dba5940
2 changed files with 14 additions and 0 deletions

View file

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

View file

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