From 37b76a43cade2627b7bbc5bb606ab746fe434ef9 Mon Sep 17 00:00:00 2001 From: landry Date: Sat, 11 May 2019 20:43:31 +0000 Subject: [PATCH] Fix build with upcoming GDAL 3. --- .../patch-src_ImportExport_ImportExportGdal_h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_h diff --git a/geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_h b/geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_h new file mode 100644 index 00000000000..559bb19b827 --- /dev/null +++ b/geo/merkaartor/patches/patch-src_ImportExport_ImportExportGdal_h @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_ImportExport_ImportExportGdal_h,v 1.1 2019/05/11 20:43:31 landry Exp $ + +detect gdal3, cf https://github.com/openstreetmap/merkaartor/issues/179 + +Index: src/ImportExport/ImportExportGdal.h +--- src/ImportExport/ImportExportGdal.h.orig ++++ src/ImportExport/ImportExportGdal.h +@@ -19,7 +19,7 @@ + #include + #include + +-#if GDAL_VERSION_MAJOR == 2 ++#if GDAL_VERSION_MAJOR >= 2 + #define GDAL2 + #endif +