summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-02 20:40:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-02 22:57:31 +0100
commit604a26a14c00c35a9db134d4261b7e7ca76476c6 (patch)
tree04fefee21c18f17714f71467fa02f10c606da0b2 /kde-frameworks/kded
parentapp-admin/hardening-check: Regenerate Manifest (diff)
downloadgentoo-604a26a14c00c35a9db134d4261b7e7ca76476c6.tar.gz
gentoo-604a26a14c00c35a9db134d4261b7e7ca76476c6.tar.bz2
gentoo-604a26a14c00c35a9db134d4261b7e7ca76476c6.zip
kde-frameworks/kded: Drop obsolete dbus calls
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/kded')
-rw-r--r--kde-frameworks/kded/Manifest2
-rw-r--r--kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch70
-rw-r--r--kde-frameworks/kded/kded-5.40.0-r1.ebuild38
3 files changed, 109 insertions, 1 deletions
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 2c0dc98c0b6..fd1c1acb6ad 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
DIST kded-5.37.0.tar.xz 38020 SHA256 fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98 SHA512 2a420cf97f55858ec6cac4a74bdf97f367b32fc07529714b494576f7828261ae52650972b9f8b80e5e12cd854f66e7bc4d2d2cd339d7ce8a71ab29ebd41e76fa WHIRLPOOL f5c6da6d02ec099072b6ded7ac207c3d6f6f7b674a99531216b2f03408ac16f530bea916f207604c0b76a9de56561ab2234c9b7b4e2413792e5e1fe521c8773e
-DIST kded-5.40.0.tar.xz 38152 SHA256 0439d68e2b08a0084b6d15e92679692090271a873ee90dca8ed0a0afa1eac449 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8 WHIRLPOOL 9bb10fa2d135394eb0c33ef15209aeae6037ba91840cf2ad3e2f26ac3acd53541e203fe02202db52d038fa1d0a7c710fd77eb4754ea87451722d1ac569e7260b
+DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8
diff --git a/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
new file mode 100644
index 00000000000..96fa447c9bc
--- /dev/null
+++ b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
@@ -0,0 +1,70 @@
+From 185afa8a3af8002172d8f5d6aa08c57244422a12 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 2 Nov 2017 22:27:29 +0100
+Subject: kded: remove dbus calls to ksplash.
+
+Summary:
+Not needed anymore since June 2016 (b6058a0 in plasma-workspace, i.e. Plasma
+5.7).
+
+Originally at https://git.reviewboard.kde.org/r/129010/
+
+Test Plan: none, this is dead code
+
+Reviewers: davidedmundson
+
+Reviewed By: davidedmundson
+
+Subscribers: #plasma, #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D8632
+---
+ src/kded.cpp | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/kded.cpp b/src/kded.cpp
+index 526bd4e..11ddd4f 100644
+--- a/src/kded.cpp
++++ b/src/kded.cpp
+@@ -37,7 +37,6 @@
+ #include <QDBusConnectionInterface>
+ #include <QDBusInterface>
+ #include <QDBusServiceWatcher>
+-#include <QDBusPendingCall>
+
+ #include <KDBusService>
+ #include <kconfiggroup.h>
+@@ -777,28 +776,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[])
+ (void) new KUpdateD; // Watch for updates
+ }
+
+-//NOTE: We are going to change how KDE starts and this certanly doesn't fit on the new design.
+-#ifdef Q_OS_LINUX
+- // Tell KSplash that KDED has started
+- QDBusMessage ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("/KSplash"),
+- QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("setStage"));
+- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("kded"));
+- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
+-#endif
+-
+ runKonfUpdate(); // Run it once.
+
+-#ifdef Q_OS_LINUX
+- ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("/KSplash"),
+- QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("setStage"));
+- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("confupdate"));
+- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
+-#endif
+-
+ int result = app.exec(); // keep running
+
+ delete kded;
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/kded/kded-5.40.0-r1.ebuild b/kde-frameworks/kded/kded-5.40.0-r1.ebuild
new file mode 100644
index 00000000000..5c25a5e9226
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.40.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kservice)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+ man? ( $(add_frameworks_dep kdoctools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-obsolete-dbus-calls.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package man KF5DocTools)
+ )
+
+ kde5_src_configure
+}