Mon Mar 4 00:03:48 PST 2013

1 files changed, 20 insertions, 37 deletions

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index fc04378db..bd1016efa 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 179039 2013-03-01 20:22:01Z andrea $
+# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
 pkgname=('qt5-base'
          'qt5-declarative'
-         'qt5-doc'
          'qt5-graphicaleffects'
          'qt5-imageformats'
          'qt5-jsbackend'
@@ -17,7 +16,7 @@ pkgname=('qt5-base'
          'qt5-webkit'
          'qt5-xmlpatterns')
 pkgver=5.0.1
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -25,7 +24,8 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
             'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
             'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient'
-            'python2' 'ruby' 'gperf')
+            'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
+            'libmng' 'openal' 'gtk2')
 groups=('qt' 'qt5')
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
@@ -74,14 +74,10 @@ build() {
     -reduce-relocations
 
   make
-
-  # Build docs
-  make qmake_all
-  make docs
 }
 
 package_qt5-base() {
-  pkgdesc=('A cross-platform application and UI framework')
+  pkgdesc='A cross-platform application and UI framework'
   depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
            'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
            'hicolor-icon-theme' 'xdg-utils')
@@ -109,7 +105,7 @@ package_qt5-base() {
 }
 
 package_qt5-declarative() {
-  pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)')
+  pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
   depends=('qt5-jsbackend' 'qt5-xmlpatterns')
   conflicts=('qt')
 
@@ -121,21 +117,8 @@ package_qt5-declarative() {
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
 
-package_qt5-doc() {
-  pkgdesc=('A cross-platform application and UI framework (Documentation)')
-  depends=('qt5-base')
-  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)')
+  pkgdesc='A cross-platform application and UI framework (QtV8)'
   depends=('qt5-base')
 
   cd ${_pkgfqn}/qtjsbackend
@@ -147,7 +130,7 @@ package_qt5-jsbackend() {
 }
 
 package_qt5-xmlpatterns() {
-  pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)')
+  pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -160,7 +143,7 @@ package_qt5-xmlpatterns() {
 }
 
 package_qt5-translations() {
-  pkgdesc=('A cross-platform application and UI framework (Translations)')
+  pkgdesc='A cross-platform application and UI framework (Translations)'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -169,8 +152,8 @@ package_qt5-translations() {
 }
 
 package_qt5-multimedia() {
-  pkgdesc=('A cross-platform application and UI framework (QtMultimedia)')
-  depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base')
+  pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
+  depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
   conflicts=('qt')
 
   cd ${_pkgfqn}/qtmultimedia
@@ -182,7 +165,7 @@ package_qt5-multimedia() {
 }
 
 package_qt5-graphicaleffects() {
-  pkgdesc=('A cross-platform application and UI framework (QtGraphicalEffects)')
+  pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtgraphicaleffects
@@ -190,8 +173,8 @@ package_qt5-graphicaleffects() {
 }
 
 package_qt5-imageformats() {
-  pkgdesc=('A cross-platform application and UI framework (Images plugins)')
-  depends=('qt5-base' 'libtiff')
+  pkgdesc='A cross-platform application and UI framework (Images plugins)'
+  depends=('qt5-base' 'libtiff' 'libmng')
   conflicts=('qt')
 
   cd ${_pkgfqn}/qtimageformats
@@ -199,7 +182,7 @@ package_qt5-imageformats() {
 }
 
 package_qt5-quick1() {
-  pkgdesc=('A cross-platform application and UI framework (QtDeclarative)')
+  pkgdesc='A cross-platform application and UI framework (QtDeclarative)'
   depends=('qt5-webkit' 'qt5-script')
   conflicts=('qt')
 
@@ -212,7 +195,7 @@ package_qt5-quick1() {
 }
 
 package_qt5-script() {
-  pkgdesc=('A cross-platform application and UI framework (QtScript)')
+  pkgdesc='A cross-platform application and UI framework (QtScript)'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -225,7 +208,7 @@ package_qt5-script() {
 }
 
 package_qt5-svg() {
-  pkgdesc=('A cross-platform application and UI framework (QtSvg)')
+  pkgdesc='A cross-platform application and UI framework (QtSvg)'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -238,7 +221,7 @@ package_qt5-svg() {
 }
   
 package_qt5-tools() {
-  pkgdesc=('A cross-platform application and UI framework (Development Tools, QtHelp)')
+  pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
   depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations')
   optdepends=('qt5-doc: documentation')
   install='qt5-tools.install'
@@ -270,8 +253,8 @@ package_qt5-tools() {
 }
 
 package_qt5-webkit() {
-  pkgdesc=('A cross-platform application and UI framework (QtWebKit)')
-  depends=('qt5-declarative' 'gstreamer0.10-base' 'icu')
+  pkgdesc='A cross-platform application and UI framework (QtWebKit)'
+  depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite')
 
   cd ${_pkgfqn}/qtwebkit
   make INSTALL_ROOT="${pkgdir}" install