From 29050654f43ba6396a35b2409afffb4d99cc2da0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 20 Jan 2015 12:42:57 +0000
Subject: [PATCH] extra/qt5 to 5.4.0-2

---
 extra/qt5/PKGBUILD | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index aa390ada5..032b41e1d 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -38,7 +38,7 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.4.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -116,6 +116,7 @@ build() {
   export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
   export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
 
+  # python2 workaround
   export PATH="${srcdir}/python2-path:$PATH"
 
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -149,12 +150,19 @@ build() {
 
   make
 
-  # Fix paths
-  find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
-  find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
-  find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
-  find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
-  sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api
+  # Fix docs build when qt is not installed
+  sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+    "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
+  sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+    "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+  sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+    qtwebkit/Source/Makefile.api
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {} +
 
   make docs
 }
@@ -172,7 +180,6 @@ package_qt5-base() {
               'libsm: xcb plugin'
               'gtk2: GTK2 plugin')
   conflicts=('qt')
-  options=('staticlibs') #libQt5PlatformSupport builds static only
 
   cd ${_pkgfqn}/qtbase
   make INSTALL_ROOT="${pkgdir}" install