Date: Tuesday, March 10, 2015 @ 17:41:58
Author: fyan
Revision: 233318
upgpkg: ksysguard 5.2.1-2
add patch for FS#44104
Added:
ksysguard/trunk/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch
Modified:
ksysguard/trunk/PKGBUILD
------------------------------------------------+
PKGBUILD | 12 +++--
a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch | 53 +++++++++++++++++++++++
2 files changed, 62 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-10 09:25:16 UTC (rev 233317)
+++ PKGBUILD 2015-03-10 16:41:58 UTC (rev 233318)
@@ -5,7 +5,7 @@
pkgname=ksysguard
pkgver=5.2.1
-pkgrel=1
+pkgrel=2
pkgdesc='KSysGuard'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/ksysguard'
@@ -16,11 +16,17 @@
conflicts=('kdebase-workspace')
groups=('plasma')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";)
-md5sums=('065e0efe3bd28f8e8565b109dc64f647')
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";
+ a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch)
+md5sums=('065e0efe3bd28f8e8565b109dc64f647'
+ '8c12f14d885c4d59cb35c1b9e0281d5b')
prepare() {
mkdir build
+
+ # FS#44104
+ cd $pkgname-$pkgver
+ patch -p1 -i ../a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch
}
build() {
Added: a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch
===================================================================
--- a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch
(rev 0)
+++ a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch 2015-03-10 16:41:58 UTC
(rev 233318)
@@ -0,0 +1,53 @@
+commit a148102e8ed56c7a8d0f790fad2f9366b27882d4
+Author: Hrvoje Senjan <hrvoje.sen...@gmail.com>
+Date: Thu Feb 26 15:57:22 2015 +0100
+
+ Register KSysguard to DBus
+
+ Unbreaks starting the app via KRun
+
+ Reviewed-by: Bhushan Shah
+
+diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+index f021f0b..3f0ce93 100644
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -54,6 +54,7 @@ target_compile_definitions(kdeinit_ksysguard PRIVATE
-DPROJECT_VERSION="${PROJEC
+ target_link_libraries(kdeinit_ksysguard
+ KF5::ProcessUi
+ KF5::SignalPlotter
++ KF5::DBusAddons
+ KF5::ItemViews
+ KF5::NewStuff
+ KF5::SysGuard
+diff --git a/gui/ksysguard.cpp b/gui/ksysguard.cpp
+index 919fd89..fa77506 100644
+--- a/gui/ksysguard.cpp
++++ b/gui/ksysguard.cpp
+@@ -37,7 +37,7 @@
+ #include <k4aboutdata.h>
+ #include <kactioncollection.h>
+ #include <kapplication.h>
+-
++#include <KDBusService>
+ #include <kdebug.h>
+ #include <kedittoolbar.h>
+ #include <kglobal.h>
+@@ -533,6 +533,7 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char**
argv )
+ KAboutData aboutData( "ksysguard", i18n( "System Monitor" ),
+ PROJECT_VERSION, i18n(Description),
KAboutLicense::GPL,
+ i18n( "(c) 1996-2008 The KDE System Monitor
Developers" ) );
++ aboutData.setOrganizationDomain(QByteArray("kde.org"));
+ aboutData.addAuthor( i18n("John Tapsell"), i18n("Current Maintainer"),
"john.taps...@kde.org" );
+ aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"),
"c...@kde.org" );
+ aboutData.addAuthor( i18n("Greg Martyn"), QString(),
"greg.mar...@gmail.com" );
+@@ -585,6 +586,9 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char**
argv )
+ Toplevel->show();
+ KSGRD::SensorMgr->setBroadcaster( Toplevel ); // SensorMgr uses a QPointer
for toplevel, so it is okay if Toplevel is deleted first
+
++ // register to DBus
++ const KDBusService dbusService(KDBusService::Multiple);
++
+ // run the application
+ int result = app.exec();
+
