[arch-commits] Commit in qt/repos (extra-i686 extra-i686/PKGBUILD)

[Pierre Schmitz]

    Date: Wednesday, September 24, 2008 @ 11:11:39
  Author: pierre
Revision: 12908

Merged revisions 12906 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qt/trunk

........
  r12906 | pierre | 2008-09-24 16:34:40 +0200 (Mi, 24 Sep 2008) | 1 line
  
  upgpkg: qt 4.4.2-3
........

Modified:
  qt/repos/extra-i686/	(properties)
  qt/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)


Property changes on: qt/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /qt/trunk:1-12761
   + /qt/trunk:1-12907

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-24 14:35:24 UTC (rev 12907)
+++ extra-i686/PKGBUILD	2008-09-24 15:11:39 UTC (rev 12908)
@@ -3,16 +3,16 @@
 
 pkgname=qt
 pkgver=4.4.2
-pkgrel=2
-_qtcopyver=862767
+pkgrel=3
+_qtcopyver=863965
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt"
 license=('GPL3')
 options=('!libtool' '!docs')
-depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng' 'sqlite3')
+depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng' 'sqlite3' 'dbus' 'libxcursor' 'libxinerama')
 optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('postgresql-libs' 'mysql' 'unixodbc')
+makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes')
 provides=("qt4=${pkgver}")
 replaces=('qt4')
 conflicts=('qt4')
@@ -21,7 +21,7 @@
 source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz"
         "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2")
 md5sums=('d310e4aada6b726c141cb3cfa848edea'
-         'cfeb2c83a0f4b40d64a54f22d7d0d228')
+         'e24c3505cdba21a254ccfc0a5b7af508')
 
 build() {
 	unset QMAKESPEC
@@ -62,10 +62,22 @@
 		-plugin-sql-{psql,mysql,sqlite,odbc} \
 		-system-sqlite \
 		-no-phonon \
+		-dbus-linked \
+		-webkit \
 		-no-separate-debug-info \
 		-nomake examples \
 		-nomake docs \
 		-nomake demos \
+		-assistant-webkit \
+		-system-libpng \
+		-system-libjpeg \
+		-system-zlib \
+		-openssl-linked \
+		-cups \
+		-reduce-relocations \
+		-xinerama \
+		-xcursor \
+		-xfixes \
 		-optimized-qmake || return 1
 
 	make || return 1