From 70d91717ef84519f32375603c2a1442e5a69882e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Mon, 5 Oct 2015 17:05:49 +0200
Subject: [PATCH] qt: fix loading 32bit plugins (close #2678).

---
 srcpkgs/qt/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 2cbb31f5b44..a902f8a7f30 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.8.7
-revision=4
+revision=5
 _distname=qt-everywhere-opensource-src
 patch_args="-Np1"
 wrksrc=${_distname}-${version}
@@ -30,12 +30,20 @@ pre_configure() {
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 }
 do_configure() {
+	local _libdir
+
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
 	export LD="$CXX"
 
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		_libdir=lib32
+	else
+		_libdir=lib
+	fi
+
 	./configure -confirm-license -opensource \
 		-prefix /usr -sysconfdir /etc -docdir /usr/share/doc/qt \
-		-plugindir /usr/lib/qt/plugins -importdir /usr/lib/qt/imports \
+		-plugindir /usr/${_libdir}/qt/plugins -importdir /usr/lib/qt/imports \
 		-translationdir /usr/share/qt/translations \
 		-datadir /usr/share/qt -bindir /usr/lib/qt/bin \
 		-nomake demos -nomake examples -gtkstyle \