qt: update to 4.7.1, remove gstreamer plugin, add sqlite plugin.

srcpkgs/qt/qt-devel-tools.template

@@ -18,7 +18,8 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/bin
 	for f in assistant* lconvert linguist pixeltool qcollectiongenerator \
-		qdbusviewer qhelp* xmlpatterns* qdbus qttrace*; do
+		qdbusviewer qhelp* xmlpatterns* qdbus qttrace* qdoc3 \
+		qmlviewer; do
 		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin || return 1
 	done
 	mkdir -p ${DESTDIR}/usr/lib

srcpkgs/qt/qt-plugin-gstreamer.template

@@ -1,31 +0,0 @@
-# Template file for 'qt-plugin-gstreamer'.
-#
-short_desc="Qt GStreamer phonon plugin"
-long_desc="${long_desc}
-
- This package contains a Qt GStreamer plugin for the phonon backend."
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
-Add_dependency run glib
-Add_dependency run MesaLib
-Add_dependency run gstreamer
-Add_dependency run gst-plugins-base
-Add_dependency run hicolor-icon-theme
-Add_dependency run qt
-
-do_install()
-{
-	local icondir=/usr/share/icons/hicolor/128x128/apps
-
-	mkdir -p ${DESTDIR}/usr/lib/qt/plugins ${DESTDIR}/${icondir}
-
-	mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/phonon_backend \
-		${DESTDIR}/usr/lib/qt/plugins || return 1
-	mv ${SRCPKGDESTDIR}/${icondir}/phonon-gstreamer.png \
-		${DESTDIR}/${icondir} || return 1
-	
-}

srcpkgs/qt/qt-plugin-sqlite.template

@@ -0,0 +1,20 @@
+# Template file for 'qt-plugin-sqlite'.
+#
+short_desc="Qt SQLite plugin"
+long_desc="${long_desc}
+
+ This package contains a Qt SQL plugin for SQLite."
+
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run sqlite
+Add_dependency run qt
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers
+
+	mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlite.so \
+		${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1
+}

srcpkgs/qt/template

@@ -1,32 +1,19 @@
 # Template file for 'qt'
 pkgname=qt
-version=4.7.0
+version=4.7.1
-revision=1
 _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
-build_style=configure
+build_style=custom-install
-configure_args="-confirm-license -opensource
--prefix /usr -sysconfdir /etc -plugindir /usr/lib/qt/plugins
--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 -largefile -plugin-sql-sqlite -system-sqlite
--xmlpatterns -phonon -phonon-backend -svg -webkit -scripttools -system-zlib
--system-libtiff -system-libpng -system-libmng -system-libjpeg
--openssl-linked -optimized-qmake -no-rpath -reduce-relocations
--no-separate-debug-info -gtkstyle -opengl -glib -no-sql-db2 -no-sql-ibase
--plugin-sql-mysql -plugin-sql-psql -no-sql-oci -no-sql-odbc -no-sql-sqlite2
--no-cups -dbus-linked -no-nas-sound -iconv -shared -release -fast -no-sql-tds"
-make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955
+checksum=8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
 long_desc="
  Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
  maintaining GUI (graphical user interface) applications."
 
-subpackages="qt-plugin-gstreamer qt-plugin-pgsql qt-plugin-mysql"
+subpackages="qt-plugin-pgsql qt-plugin-mysql qt-plugin-sqlite qt-demos"
-subpackages="${subpackages} qt-demos qt-docs qt-qmake qt-qtconfig"
+subpackages="${subpackages} qt-docs qt-qmake qt-qtconfig"
 subpackages="${subpackages} qt-designer qt-devel qt-devel-tools"
 
 # XXX Missing dependencies: unixodbc and cups.
@@ -53,7 +40,6 @@ Add_dependency run libSM
 Add_dependency run libICE
 
 Add_dependency build pkg-config
-Add_dependency build glibc-devel
 Add_dependency build freetype-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libXrender-devel
@@ -77,22 +63,44 @@ Add_dependency build libmysqlclient-devel
 Add_dependency build postgresql-libs-devel
 Add_dependency build diffutils
 
-pre_configure()
+do_build()
 {
 	# Use cmp(1) from diffutils.
 	export PATH="/usr/bin:$PATH"
-}
-
-pre_build()
-{
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
+
+	sed -i "s|-O2|${XBPS_CXXFLAGS}|" mkspecs/common/g++.conf
+	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${XBPS_LDFLAGS}|g" mkspecs/common/g++.conf
+
+	./configure -v -confirm-license -opensource \
+		-prefix /usr -sysconfdir /etc -plugindir /usr/lib/qt/plugins \
+		-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 -largefile \
+		-plugin-sql-sqlite -system-sqlite \
+		-xmlpatterns -no-phonon -no-phonon-backend -svg -webkit \
+		-scripttools -system-zlib \
+		-system-libtiff -system-libpng -system-libmng -system-libjpeg \
+		-openssl-linked -optimized-qmake -no-rpath -reduce-relocations \
+		-no-separate-debug-info -gtkstyle -opengl -glib \
+		-no-sql-db2 -no-sql-ibase \
+		-plugin-sql-mysql -plugin-sql-psql -no-sql-oci \
+		-no-sql-odbc -no-sql-sqlite2 \
+		-no-cups -dbus-linked -no-nas-sound -iconv -shared \
+		-release -fast -no-sql-tds || return 1
+
+	make ${makejobs} || return 1
 }
 
-post_install()
+do_install()
 {
 	local hicolordir=${DESTDIR}/usr/share/icons/hicolor
 
 	cd ${wrksrc} || return 1
+	make INSTALL_ROOT=${DESTDIR} install || return 1
+
 	# install missing icons and desktop files
 	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
 		size=$(echo $(basename ${icon}) | cut -d- -f2)