From 0c51fc88d54100c737a333c874854aa679a1f6b2 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Thu, 11 Jul 2019 16:28:54 +0200
Subject: [PATCH] octoxbps: fix cross

---
 srcpkgs/octoxbps/template | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index abb78865f69..ffcfce95fe7 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -8,25 +8,33 @@ makedepends="qt5-declarative-devel"
 depends="curl"
 short_desc="Qt-based XBPS front-end"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/aarnt/octoxbps"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=6f7643bb07960d8c8f60ce70dc495f866ae60a4d6d8160a7f108f79bf53d2d22
 
-do_configure() {
-	for _dir in ${wrksrc} ${wrksrc}/notifier/octoxbps-notifier; do
-		cd $_dir && qmake-qt5 ${configure_args} \
-			PREFIX=/usr \
-			LIB=/usr/lib \
-			QMAKE_CFLAGS="${CFLAGS}" \
-			QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LFLAGS="${LDFLAGS}"
-	done
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-declarative-devel"
+fi
+
+post_configure() {
+	local qmake_args
+	if [ "$CROSS_BUILD" ]; then
+		qmake_args="-qtconf ${wrksrc}/qt.conf"
+	fi
+	cd ${wrksrc}/notifier/octoxbps-notifier && qmake-qt5 ${configure_args} \
+		PREFIX=/usr \
+		LIB=/usr/lib \
+		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+		QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LFLAGS="${LDFLAGS}" \
+		${qmake_args}
 }
 
 do_build() {
 	for _dir in ${wrksrc} ${wrksrc}/notifier/octoxbps-notifier; do
-		cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target}
+		cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX"
 	done
 }