diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 553c0de8b..eccbc17b9 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -14,6 +14,7 @@ highmem=1 pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' + 'qt5-doc' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-jsbackend' @@ -29,8 +30,8 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.1.0 -pkgrel=2 +pkgver=5.1.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -92,7 +93,8 @@ build() { cd ${_pkgfqn} export QTDIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}" + export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ -prefix /usr \ @@ -106,7 +108,6 @@ build() { -plugin-sql-{psql,mysql,sqlite,odbc} \ -system-sqlite \ -openssl-linked \ - -nomake docs \ -nomake examples \ -nomake tests \ -no-rpath \ @@ -125,6 +126,15 @@ build() { $rbp_config 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 + + make docs } package_qt5-base() {