[arch-commits] Commit in qt/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Friday, October 8, 2010 @ 08:09:22
  Author: andrea
Revision: 94567

sort configure options; fix path to install imports for QML (FS#21018); add libxv to dependecies to add Xvideo support (FS#21056); cleanup dependencies and makedependencies

Modified:
  qt/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-08 11:55:27 UTC (rev 94566)
+++ PKGBUILD	2010-10-08 12:09:22 UTC (rev 94567)
@@ -4,15 +4,21 @@
 
 pkgname=qt
 pkgver=4.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
-depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils' 'ca-certificates'
-         'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl' 'libsm')
-optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2')
+depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+	'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+	'xdg-utils' 'hicolor-icon-theme')
+optdepends=('postgresql-libs: PostgreSQL driver'
+	'libmysqlclient: MySQL driver'
+	'unixodbc: ODBC driver'
+	'libxinerama: Xinerama support'
+	'libxcursor: Xcursor support'
+	'libxfixes: Xfixes support')
+makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2')
 install="${pkgname}.install"
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
@@ -43,13 +49,11 @@
 
 	./configure -confirm-license -opensource \
 		-prefix /usr \
-		-sysconfdir /etc \
 		-plugindir /usr/lib/qt/plugins \
+		-importdir /usr/lib/qt/imports \
+		-datadir /usr/share/qt \
 		-translationdir /usr/share/qt/translations \
-		-datadir /usr/share/qt \
-		-docdir /usr/share/doc/qt \
-		-examplesdir /usr/share/doc/qt/examples \
-		-demosdir /usr/share/doc/qt/demos \
+		-sysconfdir /etc \
 		-largefile \
 		-plugin-sql-{psql,mysql,sqlite,odbc} \
 		-system-sqlite \
@@ -58,22 +62,23 @@
 		-no-phonon-backend \
 		-svg \
 		-webkit \
+		-script \
 		-scripttools \
 		-system-zlib \
 		-system-libtiff \
 		-system-libpng \
 		-system-libmng \
 		-system-libjpeg \
-		-openssl-linked \
 		-nomake demos \
 		-nomake examples \
 		-nomake docs \
 		-no-rpath \
+		-openssl-linked \
 		-silent \
 		-optimized-qmake \
 		-dbus \
+		-reduce-relocations \
 		-no-separate-debug-info \
-		-reduce-relocations \
 		-gtkstyle \
 		-opengl \
 		-no-openvg \