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

[Andrea Scarpino]

    Date: Monday, August 30, 2010 @ 04:02:56
  Author: andrea
Revision: 89214

KDE 4.5.1

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

-----------------------+
 PKGBUILD              |   14 ++++----------
 kded-freeze-fix.patch |   37 -------------------------------------
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-30 08:02:50 UTC (rev 89213)
+++ PKGBUILD	2010-08-30 08:02:56 UTC (rev 89214)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
@@ -16,17 +16,11 @@
 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"
-	'kded-freeze-fix.patch')
-sha1sums=('4296b78ae517418cf25a385697c7476aef54f684'
-          '8d38a72e2c2b7202073f2ded8c2dba1924b008e8')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('454667eb411e722de10a9b921b2d30d0a052ab97')
 
 build() {
-	# fix already in kde 4.5.1
-	cd ${srcdir}/${pkgname}-${pkgver}
-        patch -Np5 -i ${srcdir}/kded-freeze-fix.patch
-
-	cd $srcdir
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Deleted: kded-freeze-fix.patch
===================================================================
--- kded-freeze-fix.patch	2010-08-30 08:02:50 UTC (rev 89213)
+++ kded-freeze-fix.patch	2010-08-30 08:02:56 UTC (rev 89214)
@@ -1,37 +0,0 @@
---- 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 );
-