Hello community, here is the log from the commit of package ksysguard5 for openSUSE:Factory checked in at 2015-03-16 09:30:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksysguard5 (Old) and /work/SRC/openSUSE:Factory/.ksysguard5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksysguard5" Changes: -------- --- /work/SRC/openSUSE:Factory/ksysguard5/ksysguard5.changes 2015-03-01 15:04:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksysguard5.new/ksysguard5.changes 2015-03-16 09:30:40.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 13 10:00:11 UTC 2015 - [email protected] + +- Add 0001-Register-KSysguard-to-DBus.patch from upstream (kde#344595) + +------------------------------------------------------------------- New: ---- 0001-Register-KSysguard-to-DBus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.wjsi4b/_old 2015-03-16 09:30:41.000000000 +0100 +++ /var/tmp/diff_new_pack.wjsi4b/_new 2015-03-16 09:30:41.000000000 +0100 @@ -28,6 +28,8 @@ Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE 0001-Use-run-for-ksysguardd-s-pid-file.patch Patch0: 0001-Use-run-for-ksysguardd-s-pid-file.patch +# PATCH-FIX-UPSTREAM 0001-Register-KSysguard-to-DBus.patch +Patch1: 0001-Register-KSysguard-to-DBus.patch BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ BuildRequires: kconfig-devel @@ -69,6 +71,7 @@ %prep %setup -q -n ksysguard-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ 0001-Register-KSysguard-to-DBus.patch ++++++ >From b3900ddedacc92db2eeec05e521fdaee94076230 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Thu, 26 Feb 2015 15:57:22 +0100 Subject: [PATCH 1/1] Register KSysguard to DBus Unbreaks starting the app via KRun Reviewed-by: Bhushan Shah BUG: 344595 --- gui/CMakeLists.txt | 1 + gui/ksysguard.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index f021f0bc94a551afbaf249526593d54adaa8b0cd..3f0ce93de2e6b2fe9c982d5dfb25b6e7bc7f5289 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 8ba115839cc218da47a73d037613ce8323eacbcd..1e3189cdb2e1dc44d8f8bcb6efa1a09e86f0905b 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"), "[email protected]" ); aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"), "[email protected]" ); aboutData.addAuthor( i18n("Greg Martyn"), QString(), "[email protected]" ); @@ -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(); -- 2.3.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
