From b4f0b2ccb553d4f2a10306e9aa506945488f97be Mon Sep 17 00:00:00 2001
From: Juergen Buchmueller <pullmoll@t-online.de>
Date: Mon, 31 Oct 2016 22:10:18 +0100
Subject: [PATCH] qt5: still more fixes for $wrksrc leaking

---
 srcpkgs/qt5/template | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 54afd6189dd..2e9b57aab7a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.6.2
-revision=5
+revision=6
 wrksrc="qt-everywhere-opensource-src-${version}"
 homepage="http://qt.io/"
 short_desc="A cross-platform application and UI framework (QT5)"
@@ -40,14 +40,19 @@ if [ -n "$CROSS_BUILD" ]; then
 fi
 
 _cleanup_wrksrc_leak() {
-	# Remove QMAKE_PRL_BUILD_DIR from *.prl files because it is the internal builddir
-	find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \;
-	# Replace ${wrksrc}/qtbase/host with /usr/lib/qt5 and the temporary mkspec
-	# devices/void-${XBPS_CROSS_TRIPLET}-g++ with linux-g++
-	find ${PKGDESTDIR} -iname "*.cmake" -o -iname "*.pc" -exec sed -i "{}" \
+	# Replace ${wrksrc} in cmake files
+	sed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \
 		-e "s;${wrksrc}/qtbase/host;/usr/lib/qt5;g" \
-		-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" \;
-	# Replace ${wrksrc}/qtbase with the final /usr/lib/qt5 in project include files
+		-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
+	# Replace ${wrksrc} in pkgconfig files
+	sed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \
+		-e "s;${wrksrc}/qtbase/host;/usr/lib/qt5;g" \
+		-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
+	# Remove QMAKE_PRL_BUILD_DIR from linker hint files
+	find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
+		-e "/^QMAKE_PRL_BUILD_DIR/d" \
+		-e "s;-L${wrksrc}/qtbase/lib;/usr/lib;g" \;
+	# Replace ${wrksrc} in project include files
 	find ${PKGDESTDIR} -iname "*.pri" -exec sed -i "{}" \
 		-e "s;${wrksrc}/qtbase;/usr/lib/qt5;g" \;
 }
@@ -329,6 +334,7 @@ do_install() {
 		ln -sf /usr/lib/qt5/bin/${base} ${PKGDESTDIR}/usr/bin/${base}-qt5
 	done
 	_move_examples
+	_cleanup_wrksrc_leak
 }
 
 qt5-3d-devel_package() {