Author: urkud
Date: Fri Aug 13 23:14:16 2010
New Revision: 23169
URL: https://svn.nixos.org/websvn/nix/?rev=23169&sc=1
Log:
Add kdebase-runtime-4.5.0
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/
nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/default.nix Fri Aug
13 23:14:16 2010 (r23169)
@@ -0,0 +1,25 @@
+{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
+ shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
+ cluceneCore, attica, virtuoso, makeWrapper }:
+
+kdePackage {
+ pn = "kdebase-runtime";
+ v = "4.5.0";
+
+ buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba
shared_mime_info
+ exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
+ makeWrapper];
+
+ patches = [ ./freeze.diff ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH :
"${virtuoso}/lib" \
+ --prefix PATH : "${virtuoso}/bin"
+ '';
+
+ meta = {
+ description = "KDE runtime";
+ longDescription = "Libraries and tools which supports running KDE desktop
applications";
+ license = "LGPL";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/base-runtime/freeze.diff Fri Aug
13 23:14:16 2010 (r23169)
@@ -0,0 +1,37 @@
+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 );
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Fri Aug 13 23:11:58
2010 (r23168)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Fri Aug 13 23:14:16
2010 (r23169)
@@ -40,6 +40,8 @@
kdebase_workspace = callPackage ./base-workspace { };
+ kdebase_runtime = callPackage ./base-runtime { };
+
kdeartwork = callPackage ./artwork { };
### DEVELOPMENT
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
