merkaartor: fix build with qt5.13

This commit is contained in:
John 2019-07-02 18:19:17 +02:00 committed by John Zimmermann
parent b562ba0202
commit 65b279d571
2 changed files with 13 additions and 6 deletions

View file

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

View file

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