commit: a82cfe37988730033815c61bc4895642d6cc0dfb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed May 5 02:50:57 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed May 5 03:00:07 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a82cfe37
kde-plasma/plasma-workspace: Remove dangerous default shortcuts Upstream commit e8e17c5ef8734fa56a78405e32277568e4e1095e KDE-bug: https://bugs.kde.org/show_bug.cgi?id=435954 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...asma-workspace-5.21.5-dangerous-shortcuts.patch | 45 ++++++++++++++++++++++ .../plasma-workspace-5.21.5.ebuild | 1 + 2 files changed, 46 insertions(+) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch new file mode 100644 index 0000000000..f04bb866d5 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch @@ -0,0 +1,45 @@ +From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001 +From: Nate Graham <n...@kde.org> +Date: Thu, 22 Apr 2021 08:38:18 -0600 +Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without + Confirmation" actions + +These actions bypass the user setting for whether or not to show the +logout screen and always log out/reboot/etc. immediately. Because they +have default keyboard shortcuts, they can be triggered by accident and +cause unexpected logouts/reboots/etc. + +BUG: 435954 +FIXED-IN: 5.22 +--- + ksmserver/server.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp +index ac9da9f09..6f3179fb9 100644 +--- a/ksmserver/server.cpp ++++ b/ksmserver/server.cpp +@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts() + + a = actionCollection->addAction(QStringLiteral("Log Out Without Confirmation")); + a->setText(i18n("Log Out Without Confirmation")); +- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete); ++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); + connect(a, &QAction::triggered, this, &KSMServer::logoutWithoutConfirmation); + + a = actionCollection->addAction(QStringLiteral("Halt Without Confirmation")); + a->setText(i18n("Halt Without Confirmation")); +- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown); ++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); + connect(a, &QAction::triggered, this, &KSMServer::haltWithoutConfirmation); + + a = actionCollection->addAction(QStringLiteral("Reboot Without Confirmation")); + a->setText(i18n("Reboot Without Confirmation")); +- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp); ++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); + connect(a, &QAction::triggered, this, &KSMServer::rebootWithoutConfirmation); + } + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild index 31b3b92188..b8e5237f6d 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 + "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954 ) src_prepare() {
