From 085ca01503ba86daeabd413ba802ccf5fc287f94 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 30 Aug 2013 03:00:09 -0700
Subject: Fri Aug 30 02:57:58 PDT 2013

---
 extra/qt5/PKGBUILD | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'extra/qt5/PKGBUILD')

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 703664ac4..7203c3784 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 193689 2013-08-28 00:06:10Z eric $
+# $Id: PKGBUILD 193725 2013-08-29 13:10:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
 pkgname=('qt5-base'
          'qt5-declarative'
+         'qt5-doc'
          'qt5-graphicaleffects'
          'qt5-imageformats'
          'qt5-jsbackend'
@@ -19,8 +20,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')
@@ -37,7 +38,7 @@ source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/singl
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
         'use-python2.patch'
         'bison3.patch')
-md5sums=('44a507beebef73eb364b5a2ec7bbe090'
+md5sums=('697b7b8768ef8895e168366ab6b44760'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
@@ -67,7 +68,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 \
@@ -81,15 +83,22 @@ build() {
     -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
     -system-sqlite \
     -openssl-linked \
-    -nomake docs \
     -nomake examples \
-    -nomake tests \
     -no-rpath \
     -optimized-qmake \
     -dbus-linked \
     -reduce-relocations
 
   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() {
@@ -144,6 +153,20 @@ package_qt5-declarative() {
   done
 }
 
+package_qt5-doc() {
+  pkgdesc='A cross-platform application and UI framework (Documentation)'
+  depends=('qt5-base')
+#  arch=('any')
+  conflicts=('qt-doc')
+  replaces=('qt-doc')
+  provides=('qt-doc')
+  options=('docs')
+  groups=()
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT="${pkgdir}" install_docs
+}
+
 package_qt5-jsbackend() {
   pkgdesc='A cross-platform application and UI framework (QtV8)'
   depends=('qt5-base')
-- 
cgit v1.2.3-54-g00ecf