--- /var/abs/extra/qt/PKGBUILD	2009-12-01 06:07:36.000000000 +0100
+++ PKGBUILD	2009-12-02 07:42:59.000000000 +0100
@@ -2,51 +2,32 @@
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt
-pkgver=4.5.3
+pkgver=4.6.0
 pkgrel=3
-_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
-url='http://www.qtsoftware.com/'
+url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
 depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
-         'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'gstreamer0.10-base-plugins'
+         'libxrandr' 'glib2' 'libxi' 'libxcursor' 'libxinerama' 'libxrender' 'gstreamer0.10-base-plugins'
          'ca-certificates')
-optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2')
+optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc' 'dbus')
+makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2' 'dbus-core')
 install=qt.install
 provides=("qt4=${pkgver}" 'phonon')
 replaces=('qt4' 'phonon')
 conflicts=('qt4' 'phonon')
 options=('!libtool')
-_pkgfqn="qt-x11-opensource-src-${pkgver}"
-source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz"
-        "ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz"
-	'gstreamer-logo.png'
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-        'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
-md5sums=('3988cf9af68be2df8a8000ede231de9b'
-         'a8b984c95ea658116a7b4f632ae93596'
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
+     	'gstreamer-logo.png'
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' )
+md5sums=('2a7b5126f2450d8525af355fc4c12ad6'
          'f0c26f76acf8b6a3297cfb31f872b0b7'
          'a445c6917086d80f1cfc1e40cb6b0132'
          'd457f0a0ad68a3861c3cadefe3b42ded'
          '668331d9798a0e2b94381efb7be4c513'
-         'c29f2993d6a0f73d756d2fa36e130e1c'
-         'a7e450751f42bdff17e57fdc4af72a18'
-         'ca0debc49d3505423e3b5742fdbfd852'
-         'd5c4cad7af93f1d736d4569a207bd739')
-
-_create-kdeqt-patch() {
-	local codir=$(mktemp -d)
-	mkdir -p "${codir}/kde-qt"
-	git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
-	pushd "${codir}/kde-qt"
-	local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
-	git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
-	popd
-	mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
-	rm -rf "${codir}"
-}
+         'c29f2993d6a0f73d756d2fa36e130e1c')
 
 build() {
 	unset QMAKESPEC
@@ -54,16 +35,7 @@
 	export PATH=${QT4DIR}/bin:${PATH}
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-	cd $srcdir/$_pkgfqn
-	patch -p1 -i $srcdir/kde-qt-${_kdeqtver}.patch || return 1
-
-	# see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
-	# enable qdoc3
-	patch -p1 -i $srcdir/qdoc3.patch || return 1
-	# install service files needed by KDE
-	patch -p1 -i $srcdir/phonon.patch || return 1
-	# use system ssl cert bundle
-	patch -p1 -i $srcdir/ca-certificates.patch || return 1
+        cd $srcdir/$_pkgfqn
 
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf