From 20a0469f1c727950270dff5fee46eb2898bf82ad Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:22:43 +0000
Subject: [PATCH] kdebase-{runtime,workspace}, kdebindings

svn path=/nixpkgs/trunk/; revision=23751
---
 .../desktops/kde-4.5/base-runtime/default.nix |  5 +--
 .../desktops/kde-4.5/base-runtime/freeze.diff | 37 -------------------
 .../kde-4.5/base-workspace/default.nix        |  4 +-
 pkgs/desktops/kde-4.5/bindings/default.nix    |  2 +-
 .../desktops/kde-4.5/kde-package/manifest.nix | 12 ++++++
 5 files changed, 16 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/base-runtime/freeze.diff

diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix
index 95e15a76061..02fa06e2961 100644
--- a/pkgs/desktops/kde-4.5/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix
@@ -8,12 +8,9 @@ kde.package {
     exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
     makeWrapper];
 
-  patches = [ ./freeze.diff ];
-
 # TODO: OpenSLP, OpenEXR
   postInstall = ''
     rm -v $out/share/icons/default.kde4
-    ln -s ${oxygen_icons}/share/icons/oxygen $out/share/icons/default.kde4
     wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
         --prefix PATH : "${virtuoso}/bin"
   '';
@@ -24,7 +21,7 @@ kde.package {
     license = "LGPL";
     kde = {
       name = "kdebase-runtime";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
deleted file mode 100644
index 62079f6e8ce..00000000000
--- a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
-===================================================================
---- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1160390)
-+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 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>();
- 
-Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.h
-===================================================================
---- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 1160390)
-+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 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 );
diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix
index 169eb87f953..6bd2393753c 100644
--- a/pkgs/desktops/kde-4.5/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@@ -16,12 +16,12 @@ kde.package {
     pciutils bluez ];
 
   meta = {
-    description = "KDE Workspace";
+    description = "KDE base platform-specific components";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
     license = "GPL";
     kde = {
       name = "kdebase-workspace";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index 4d0567a2d4c..678bef352f1 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -30,7 +30,7 @@ kde.package rec {
     license = "LGPL";
     kde = {
       name = "kdebindings";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 8c26b159dd5..a7291b581cf 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -112,4 +112,16 @@ builtins.listToAttrs
   name = "kdebase-4.5.1.tar.bz2";
   value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
 }
+{
+  name = "kdebase-runtime-4.5.1.tar.bz2";
+  value = "1fjpyxzffl0ravyicgb56sqaw5zkwky98lj9ad6z4rdiysq5v5rz";
+}
+{
+  name = "kdebase-workspace-4.5.1.tar.bz2";
+  value = "0mrx03bsb9qj78k0l04q28gc8l7ky0y0rqdshv4spbmrjfsa03fd";
+}
+{
+  name = "kdebindings-4.5.1.tar.bz2";
+  value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
+}
 ]