From 673bc8f56eece0bdb818cffc095d28e628932e41 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 3 Nov 2019 07:45:20 +0100 Subject: [PATCH] gpsbabel: use qmake build-helper enable cross-builds and fix package cleanup --- srcpkgs/gpsbabel/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index fefdd27cf25..52ca3beb85c 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -4,6 +4,7 @@ version=1.5.4 revision=1 wrksrc="gpsbabel-gpsbabel_${version//./_}" build_style=gnu-configure +build_helper=qmake makedepends="qt5-devel libusb-compat-devel" depends="desktop-file-utils" short_desc="Converts waypoints, tracks, and routes between popular GPS formats" @@ -14,10 +15,10 @@ distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version// checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704 replaces="gpsbabel-gui>=0" -nocross="Builds components as the host arch" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" + configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake" fi do_build() { @@ -44,7 +45,7 @@ do_install() { mv gui/*.qm ${DESTDIR}/usr/share/gpsbabel/translations } -do_clean() { +post_pkg() { # Remove temporary stuff from masterdir rm -rf ${XBPS_BUILDDIR}/babelweb }