1 |
commit: deda9bbdb1d52f9f030ce978a214430c86695d3e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 29 12:31:28 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 12:46:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deda9bbd |
7 |
|
8 |
kde-plasma/plasma-integration: Make folder view don't move to trash on Ctrl+D |
9 |
|
10 |
Upstream commit 15c7926377065da0fea111be303816dca91d087a |
11 |
|
12 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=426573 |
13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
...e-standard-kde-shortcut-for-move-to-trash.patch | 34 +++++++++++++++ |
17 |
.../plasma-integration-5.19.5-r1.ebuild | 50 ++++++++++++++++++++++ |
18 |
2 files changed, 84 insertions(+) |
19 |
|
20 |
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..7405dace6be |
23 |
--- /dev/null |
24 |
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch |
25 |
@@ -0,0 +1,34 @@ |
26 |
+From 15c7926377065da0fea111be303816dca91d087a Mon Sep 17 00:00:00 2001 |
27 |
+From: Nate Graham <nate@×××.org> |
28 |
+Date: Tue, 15 Sep 2020 13:31:48 -0600 |
29 |
+Subject: [PATCH] Use KDE shortcuts for "move to trash" action coming from |
30 |
+ QStandardKey |
31 |
+ |
32 |
+QKeySequence::Delete is the Qt "Move to trash" action, which, by |
33 |
+default, includes Ctrl+D as a shortcut. This is something we don't want |
34 |
+in KDE software, so we need to intercept this action in our integration |
35 |
+plugin and give it the standard KDE shortcuts instead, as we do for |
36 |
+other actions. |
37 |
+ |
38 |
+BUG: 426573 |
39 |
+FIXED-IN: 5.20 |
40 |
+--- |
41 |
+ src/platformtheme/kdeplatformtheme.cpp | 2 ++ |
42 |
+ 1 file changed, 2 insertions(+) |
43 |
+ |
44 |
+diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp |
45 |
+index 24ac7e7..18b3f6f 100644 |
46 |
+--- a/src/platformtheme/kdeplatformtheme.cpp |
47 |
++++ b/src/platformtheme/kdeplatformtheme.cpp |
48 |
+@@ -257,6 +257,8 @@ QList<QKeySequence> KdePlatformTheme::keyBindings(QKeySequence::StandardKey key) |
49 |
+ return KStandardShortcut::shortcut(KStandardShortcut::TabNext); |
50 |
+ case QKeySequence::PreviousChild: |
51 |
+ return KStandardShortcut::shortcut(KStandardShortcut::TabPrev); |
52 |
++ case QKeySequence::Delete: |
53 |
++ return KStandardShortcut::shortcut(KStandardShortcut::MoveToTrash); |
54 |
+ default: |
55 |
+ return QPlatformTheme::keyBindings(key); |
56 |
+ } |
57 |
+-- |
58 |
+GitLab |
59 |
+ |
60 |
|
61 |
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild |
62 |
new file mode 100644 |
63 |
index 00000000000..51a301c73ca |
64 |
--- /dev/null |
65 |
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild |
66 |
@@ -0,0 +1,50 @@ |
67 |
+# Copyright 1999-2020 Gentoo Authors |
68 |
+# Distributed under the terms of the GNU General Public License v2 |
69 |
+ |
70 |
+EAPI=7 |
71 |
+ |
72 |
+KFMIN=5.71.0 |
73 |
+PVCUT=$(ver_cut 1-3) |
74 |
+QTMIN=5.14.2 |
75 |
+VIRTUALX_REQUIRED="test" |
76 |
+inherit ecm kde.org |
77 |
+ |
78 |
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" |
79 |
+ |
80 |
+LICENSE="LGPL-2+" |
81 |
+SLOT="5" |
82 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
83 |
+IUSE="" |
84 |
+ |
85 |
+DEPEND=" |
86 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
87 |
+ >=dev-qt/qtgui-${QTMIN}:5=[dbus] |
88 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
89 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
90 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
91 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
92 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
93 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
94 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
95 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
97 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
99 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kwayland-${KFMIN}:5 |
101 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
102 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
104 |
+ >=kde-plasma/breeze-${PVCUT}:5 |
105 |
+ x11-libs/libXcursor |
106 |
+ x11-libs/libxcb |
107 |
+" |
108 |
+RDEPEND="${DEPEND} |
109 |
+ media-fonts/hack |
110 |
+ media-fonts/noto |
111 |
+" |
112 |
+ |
113 |
+# requires running kde environment |
114 |
+RESTRICT+=" test" |
115 |
+ |
116 |
+PATCHES=( "${FILESDIR}"/${P}-use-standard-kde-shortcut-for-move-to-trash.patch ) |