diff --git a/srcpkgs/gsettings-qt/template b/srcpkgs/gsettings-qt/template index 4b45ad00870..5db352df526 100644 --- a/srcpkgs/gsettings-qt/template +++ b/srcpkgs/gsettings-qt/template @@ -11,23 +11,26 @@ license="LGPL-3.0-only" homepage="https://launchpad.net/gsettings-qt" distfiles="$DEBIAN_SITE/main/g/gsettings-qt/gsettings-qt_${version}.orig.tar.gz" checksum=a3d1020d526ece2319f1e8f05876e456e85279741653008e05c5d7e8b019c9b9 -nocross=yes -# some things do get wrongly installed into $DESTDOR/$XBPS_CROSS_BASE if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel qt5-declarative-devel" fi pre_configure() { - #disable generation for qmltypes file while cross building - #also makes trouble x86_64-musl so just remove it for everything + # disable generation for qmltypes file while cross building + # also makes trouble x86_64-musl so just remove it for everything if [ "$CROSS_BUILD" ] || [ "${XBPS_TARGET_MACHINE#*-musl}" != "$XBPS_TARGET_MACHINE" ];then - sed -i -e '/qmltypes/ d' GSettings/gsettings-qt.pro + vsed -i GSettings/gsettings-qt.pro -e '/qmltypes/ d' fi } post_install() { - rm -r ${DESTDIR}/usr/tests + if [ "$CROSS_BUILD" ]; then + rm -r ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/tests + cp -a ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/* ${DESTDIR}/usr/ + else + rm -r ${DESTDIR}/usr/tests + fi } gsettings-qt-devel_package() {