From 65b279d5714ae000f9da4bc226c0cf366e8c8bd3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 2 Jul 2019 18:19:17 +0200
Subject: [PATCH] merkaartor: fix build with qt5.13

---
 srcpkgs/merkaartor/patches/qt5.13.patch | 11 +++++++++++
 srcpkgs/merkaartor/template             |  8 ++------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/merkaartor/patches/qt5.13.patch

diff --git a/srcpkgs/merkaartor/patches/qt5.13.patch b/srcpkgs/merkaartor/patches/qt5.13.patch
new file mode 100644
index 00000000000..7fa4f4e27a9
--- /dev/null
+++ b/srcpkgs/merkaartor/patches/qt5.13.patch
@@ -0,0 +1,11 @@
+--- 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 3ee40185ab7..5e44f5f7cb1 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -4,7 +4,7 @@ version=0.18.3
 revision=9
 build_style=qmake
 configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
-hostmakedepends="qt5-qmake libgdal-tools"
+hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
 makedepends="libgdal-devel proj-devel qt5-declarative-devel qt5-svg-devel
  qt5-tools-devel qt5-webkit-devel quazip-devel"
 short_desc="Openstreetmap map editor"
@@ -17,9 +17,5 @@ checksum=d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947
 CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-webkit-devel"
-	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5"
-	for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do
-		CXXFLAGS+=" -I$i"
-	done
+	hostmakedepends+=" qt5-svg-devel qt5-webkit-devel"
 fi