[arch-commits] Commit in kdebase-runtime/trunk (PKGBUILD kded-freeze-fix.patch)

[Ronald van Haren]

    Date: Tuesday, August 10, 2010 @ 09:27:53
  Author: ronald
Revision: 87065

add backport patch preventing kded freeze on first run kioslave

Added:
  kdebase-runtime/trunk/kded-freeze-fix.patch
Modified:
  kdebase-runtime/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   10 ++++++++--
 kded-freeze-fix.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-10 12:05:04 UTC (rev 87064)
+++ PKGBUILD	2010-08-10 13:27:53 UTC (rev 87065)
@@ -16,10 +16,16 @@
 optdepends=('htdig: to build the search index'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('46470a4ccda687608c8669989580efef983cb25f')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+	'kded-freeze-fix.patch')
+sha1sums=('4296b78ae517418cf25a385697c7476aef54f684'
+          '8d38a72e2c2b7202073f2ded8c2dba1924b008e8')
 
 build() {
+	# fix already in kde 4.5.1
+	cd ${srcdir}/${pkgname}-${pkgver}
+        patch -Np5 -i ${srcdir}/kded-freeze-fix.patch
+
 	cd $srcdir
 	mkdir build
 	cd build

Added: kded-freeze-fix.patch
===================================================================
--- kded-freeze-fix.patch	                        (rev 0)
+++ kded-freeze-fix.patch	2010-08-10 13:27:53 UTC (rev 87065)
@@ -0,0 +1,37 @@
+--- branches/KDE/4.5/kdebase/runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	2010/08/08 00:40:00	
+1160390
++++ branches/KDE/4.5/kdebase/runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	2010/08/08 00:41:23	
+1160391
+@@ -36,6 +36,7 @@
+ #include <QtDBus/QDBusConnection>
+ #include <QtDBus/QDBusInterface>
+ #include <QtDBus/QDBusPendingCallWatcher>
++#include <QtCore/QTimer>
+ #include <QtCore/QStringList>
+ 
+ #include <KDebug>
+@@ -60,6 +61,11 @@
+ 
+ void UpnpNetworkBuilder::start()
+ {
++    QTimer::singleShot(0, this, SLOT(startBrowse()));
++}
++
++void UpnpNetworkBuilder::startBrowse()
++{
+     qDBusRegisterMetaType<DeviceTypeMap>();
+     qDBusRegisterMetaType<Cagibi::Device>();
+
+
+--- branches/KDE/4.5/kdebase/runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	2010/08/08 00:40:00	1160390
++++ branches/KDE/4.5/kdebase/runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	2010/08/08 00:41:23	1160391
+@@ -63,6 +63,8 @@
+     void removeUPnPDevices( const QList<Cagibi::Device>& devices );
+ 
+   private Q_SLOTS:
++    void startBrowse();
++
+     void onDevicesAdded( const DeviceTypeMap& deviceTypeMap );
+     void onDevicesRemoved( const DeviceTypeMap& deviceTypeMap );
+     void onAddedDeviceDetails( const Cagibi::Device& device );
+