3
0
Fork 0
forked from mirrors/nixpkgs

Add kdebase-runtime-4.5.0

svn path=/nixpkgs/trunk/; revision=23169
This commit is contained in:
Yury G. Kudryashov 2010-08-13 23:14:16 +00:00
parent 83a87e9959
commit e7b1d4c69e
3 changed files with 64 additions and 0 deletions

View file

@ -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";
};
}

View file

@ -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 );

View file

@ -40,6 +40,8 @@
kdebase_workspace = callPackage ./base-workspace { };
kdebase_runtime = callPackage ./base-runtime { };
kdeartwork = callPackage ./artwork { };
### DEVELOPMENT