Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/darkhttpd/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpicview/PKGBUILD
	community/iftop/PKGBUILD
	community/lazarus/PKGBUILD
	community/netsurf/PKGBUILD
	community/polkit-gnome/PKGBUILD
	community/texvc/PKGBUILD
	community/unbound/PKGBUILD
	community/xfmedia/PKGBUILD
	core/glibc/PKGBUILD
	extra/arora/PKGBUILD
	extra/cairo/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/libmng/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/sqlite/PKGBUILD
	libre/midori-libre/PKGBUILD
	~fauno/distccd-zeroconf/PKGBUILD
	~fauno/kyotocabinet/PKGBUILD
	~fauno/kyototycoon/PKGBUILD

1 files changed, 35 insertions, 18 deletions

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 57c0787f5..98161b0c4 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $
+# $Id: PKGBUILD 193725 2013-08-29 13:10:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -10,6 +10,7 @@ pkgname=('qt5-base'
 # V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there.
 [ "$CARCH" != "mips64el" ] && pkgname+=(
          'qt5-declarative'
+         'qt5-doc'
          'qt5-graphicaleffects'
          'qt5-jsbackend'
          'qt5-multimedia'
@@ -24,11 +25,11 @@ pkgname=('qt5-base'
          'qt5-webkit'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.1.0
+pkgver=5.1.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
             'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
@@ -42,13 +43,15 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
         'use-python2.patch' 'qatomic-before-mips32.patch')
-md5sums=('44a507beebef73eb364b5a2ec7bbe090'
+        'bison3.patch')
+md5sums=('697b7b8768ef8895e168366ab6b44760'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
          '92831f79144d5cb8121915423ba47575'
-         '84d7fcc2b5f270f482d5522ae01c29e2')
+         '84d7fcc2b5f270f482d5522ae01c29e2'
+         '6b162cd2bc104f0ae83ca039401be7bf')
 
 prepare() {
   cd ${_pkgfqn}
@@ -65,13 +68,18 @@ prepare() {
 
   # Fix build without -march=mips32, mips64 or its superset.
   patch -p1 -i "$srcdir/qatomic-before-mips32.patch"
+
+  # Fix build with bison 3.x
+  cd qtwebkit
+  patch -p1 -i "${srcdir}"/bison3.patch
 }
 
 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
 
 # disable firebird on mips64el
   [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase"
@@ -88,9 +96,7 @@ build() {
     -plugin-sql-{psql,mysql,sqlite,odbc} \
     -system-sqlite \
     -openssl-linked \
-    -nomake docs \
     -nomake examples \
-    -nomake tests \
     -no-rpath \
     -optimized-qmake \
     -dbus-linked \
@@ -102,17 +108,14 @@ build() {
   make $modules
 
 if [ "$CARCH" != "mips64el" ]; then
-  # build docs
-  make docs
+  # 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
 
-  # build examples
-  for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
-    qtwebkit-examples-and-demos qtxmlpatterns; do
-    cd ${m}/examples
-    ${QTDIR}/qtbase/bin/qmake
-    make
-    cd ../../
-  done
+  make docs
 fi
 }
 
@@ -168,6 +171,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')