diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index cbbe6da9861..6a1dedbb469 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,11 +1,12 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.18.3 -revision=7 +revision=8 build_style=qmake -hostmakedepends="qt5-qmake qt5-declarative-devel libgdal-tools" +configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5" +hostmakedepends="qt5-qmake libgdal-tools" makedepends="libgdal-devel proj-devel qt5-declarative-devel qt5-svg-devel - qt5-tools-devel qt5-webkit-devel" + qt5-tools-devel qt5-webkit-devel quazip-devel" short_desc="Openstreetmap map editor" maintainer="John " license="GPL-2.0-or-later" @@ -13,10 +14,12 @@ homepage="http://merkaartor.be" distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz" checksum=d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 -nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/18703/steps/shell_3/logs/stdio" -CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" -CXXFLAGS="${CFLAGS}" +CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel qt5-webkit-devel" +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 fi