1 |
commit: 73f1a3a992d7a2f802b643c0c6b0cc67db403259 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 29 11:02:09 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 29 20:57:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=73f1a3a9 |
7 |
|
8 |
kde-plasma/khotkeys: Update DEPENDs |
9 |
|
10 |
Upstream commit 8ba8a29, reverting commit 1d60f46f, see also: |
11 |
https://invent.kde.org/plasma/khotkeys/-/merge_requests/7 |
12 |
|
13 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
.../files/khotkeys-5.20.4-unused-dep.patch | 28 ++++++++++++++++++++++ |
17 |
kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild | 3 +++ |
18 |
kde-plasma/khotkeys/khotkeys-9999.ebuild | 1 + |
19 |
3 files changed, 32 insertions(+) |
20 |
|
21 |
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch |
22 |
new file mode 100644 |
23 |
index 0000000000..6d39c54657 |
24 |
--- /dev/null |
25 |
+++ b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch |
26 |
@@ -0,0 +1,28 @@ |
27 |
+From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001 |
28 |
+From: Andreas Sturmlechner <asturm@g.o> |
29 |
+Date: Sun, 29 Nov 2020 11:55:10 +0100 |
30 |
+Subject: [PATCH] Drop unused KF5Plasma dependency |
31 |
+ |
32 |
+This had been already dropped in commit 1d60f46f, which was reverted in |
33 |
+commit 8ba8a29c. At least that part of it was correct though. |
34 |
+ |
35 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
36 |
+--- |
37 |
+ CMakeLists.txt | 1 - |
38 |
+ 1 file changed, 1 deletion(-) |
39 |
+ |
40 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
41 |
+index a945dee..b49bff1 100644 |
42 |
+--- a/CMakeLists.txt |
43 |
++++ b/CMakeLists.txt |
44 |
+@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
45 |
+ KDELibs4Support |
46 |
+ DBusAddons |
47 |
+ KCMUtils |
48 |
+- Plasma |
49 |
+ ) |
50 |
+ |
51 |
+ find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst) |
52 |
+-- |
53 |
+2.29.2 |
54 |
+ |
55 |
|
56 |
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild |
57 |
index 4fb73e1d54..1186835fab 100644 |
58 |
--- a/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild |
59 |
+++ b/kde-plasma/khotkeys/khotkeys-5.20.49.9999.ebuild |
60 |
@@ -35,6 +35,7 @@ COMMON_DEPEND=" |
61 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
62 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
63 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
64 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
65 |
x11-libs/libX11 |
66 |
x11-libs/libXtst |
67 |
" |
68 |
@@ -47,3 +48,5 @@ RDEPEND="${COMMON_DEPEND} |
69 |
>=kde-frameworks/kded-${KFMIN}:5 |
70 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
71 |
" |
72 |
+ |
73 |
+PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch ) |
74 |
|
75 |
diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild |
76 |
index 6e5a1b3061..9888497911 100644 |
77 |
--- a/kde-plasma/khotkeys/khotkeys-9999.ebuild |
78 |
+++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild |
79 |
@@ -35,6 +35,7 @@ COMMON_DEPEND=" |
80 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
81 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
82 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
83 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
84 |
x11-libs/libX11 |
85 |
x11-libs/libXtst |
86 |
" |