From c1f623ef22719a42998f8668c92c4fda64b555e8 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 3 Nov 2019 07:47:33 +0100 Subject: [PATCH] qjackctl: use qmake build-helper --- srcpkgs/qjackctl/template | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index ef52b716f0f..9cf6b2e1d3a 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -2,7 +2,8 @@ pkgname=qjackctl version=0.6.0 revision=1 -build_style=qmake +build_style=gnu-configure +build_helper=qmake hostmakedepends="pkg-config" makedepends="qt5-devel jack-devel qt5-x11extras-devel" depends="desktop-file-utils hicolor-icon-theme jack" @@ -15,16 +16,9 @@ checksum=9dd5ee9a7f0a2d1d530b10652e09972732dc210239b7c082be816f0e7bdfadcd if [ "${CROSS_BUILD}" ]; then hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel" - crossargs="--host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE" + configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake" fi do_patch() { vsed -i '21i#include // gethostname()' src/qjackctl.cpp - vsed -i "s/@\$(QMAKE).*/& QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX/" Makefile.in -} - -pre_configure() { - local defargs="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin --with-libtool-sysroot=$XBPS_CROSS_BASE --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var" - local args="--enable-jack-version --disable-xunique" - ./configure $defargs $args $crossargs }