From bb6bbca0615265da703703b6258af0c7b1f4cc37 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sat, 16 Nov 2019 00:57:17 +0100
Subject: [PATCH] merkaartor: update to 0.18.4.

---
 srcpkgs/merkaartor/patches/gdal3.patch  | 11 -----------
 srcpkgs/merkaartor/patches/qt5.13.patch | 11 -----------
 srcpkgs/merkaartor/template             |  6 +++---
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/merkaartor/patches/gdal3.patch
 delete mode 100644 srcpkgs/merkaartor/patches/qt5.13.patch

diff --git a/srcpkgs/merkaartor/patches/gdal3.patch b/srcpkgs/merkaartor/patches/gdal3.patch
deleted file mode 100644
index f464068022e..00000000000
--- a/srcpkgs/merkaartor/patches/gdal3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/patches/qt5.13.patch b/srcpkgs/merkaartor/patches/qt5.13.patch
deleted file mode 100644
index 7fa4f4e27a9..00000000000
--- a/srcpkgs/merkaartor/patches/qt5.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Layers/LicenseDisplayDialog.ui	2016-09-06 00:29:45.000000000 +0200
-+++ -	2019-07-06 21:20:05.476017057 +0200
-@@ -43,7 +43,7 @@
-   <customwidget>
-    <class>QWebView</class>
-    <extends>QWidget</extends>
--   <header>QtWebKit/QWebView</header>
-+   <header>QWebView</header>
-   </customwidget>
-  </customwidgets>
-  <resources/>
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 3b4485f979a..12eeb5160aa 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
 # Template file for 'merkaartor'
 pkgname=merkaartor
-version=0.18.3
-revision=10
+version=0.18.4
+revision=1
 build_style=qmake
 configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
 hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="http://merkaartor.be"
 distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz"
-checksum=d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947
+checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a
 
 CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"