1 |
commit: 5d3990053ff7154b2e569ea048446c2ef8106d4f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 24 16:16:08 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 24 17:55:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d399005 |
7 |
|
8 |
kde-apps/kate: Fix and add implicit dependency |
9 |
|
10 |
Upstream commit: 93d8c2a1887ab70455f471d8e05f346921497a36 |
11 |
|
12 |
See also: https://invent.kde.org/utilities/kate/-/merge_requests/369 |
13 |
|
14 |
Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com> |
15 |
Bug: https://bugs.gentoo.org/785412 |
16 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
.../kate/files/kate-21.04.0-implicit-dep.patch | 69 ++++++++++++++++++++++ |
20 |
kde-apps/kate/kate-21.04.49.9999.ebuild | 6 ++ |
21 |
kde-apps/kate/kate-9999.ebuild | 1 + |
22 |
3 files changed, 76 insertions(+) |
23 |
|
24 |
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch |
25 |
new file mode 100644 |
26 |
index 0000000000..482d9a872c |
27 |
--- /dev/null |
28 |
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch |
29 |
@@ -0,0 +1,69 @@ |
30 |
+From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001 |
31 |
+From: Andreas Sturmlechner <asturm@g.o> |
32 |
+Date: Sat, 24 Apr 2021 18:08:33 +0200 |
33 |
+Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search |
34 |
+ |
35 |
+Implicit use via KIO. |
36 |
+ |
37 |
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
38 |
+ |
39 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
40 |
+--- |
41 |
+ addons/project/CMakeLists.txt | 4 +++- |
42 |
+ addons/search/CMakeLists.txt | 6 ++++-- |
43 |
+ 2 files changed, 7 insertions(+), 3 deletions(-) |
44 |
+ |
45 |
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt |
46 |
+index 16487f6cc..b1f66ada3 100644 |
47 |
+--- a/addons/project/CMakeLists.txt |
48 |
++++ b/addons/project/CMakeLists.txt |
49 |
+@@ -1,3 +1,4 @@ |
50 |
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET) |
51 |
+ find_package( |
52 |
+ KF5 ${KF5_DEP_VERSION} |
53 |
+ QUIET |
54 |
+@@ -9,7 +10,7 @@ find_package( |
55 |
+ set_package_properties(KFGuiAddons PROPERTIES PURPOSE "Required to build the project addon") |
56 |
+ set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the project addon") |
57 |
+ |
58 |
+-if(NOT KF5_FOUND) |
59 |
++if(NOT KF5_FOUND OR NOT Qt5Concurrent_FOUND) |
60 |
+ return() |
61 |
+ endif() |
62 |
+ |
63 |
+@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro |
64 |
+ target_link_libraries( |
65 |
+ kateprojectplugin |
66 |
+ PRIVATE |
67 |
++ Qt5::Concurrent |
68 |
+ KF5::GuiAddons |
69 |
+ KF5::NewStuff |
70 |
+ KF5::TextEditor |
71 |
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt |
72 |
+index 9bbe2c1c9..a541f78b8 100644 |
73 |
+--- a/addons/search/CMakeLists.txt |
74 |
++++ b/addons/search/CMakeLists.txt |
75 |
+@@ -1,7 +1,8 @@ |
76 |
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET) |
77 |
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET) |
78 |
+ set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon") |
79 |
+ |
80 |
+-if(NOT KF5ItemViews_FOUND) |
81 |
++if(NOT KF5ItemViews_FOUND OR NOT Qt5Concurrent_FOUND) |
82 |
+ return() |
83 |
+ endif() |
84 |
+ |
85 |
+@@ -9,8 +10,9 @@ add_library(katesearchplugin MODULE "") |
86 |
+ target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch") |
87 |
+ |
88 |
+ target_link_libraries( |
89 |
+- katesearchplugin |
90 |
++ katesearchplugin |
91 |
+ PRIVATE |
92 |
++ Qt5::Concurrent |
93 |
+ KF5::ItemViews |
94 |
+ KF5::TextEditor |
95 |
+ ) |
96 |
+-- |
97 |
+2.31.1 |
98 |
+ |
99 |
|
100 |
diff --git a/kde-apps/kate/kate-21.04.49.9999.ebuild b/kde-apps/kate/kate-21.04.49.9999.ebuild |
101 |
index c5a0ab5919..20c4559309 100644 |
102 |
--- a/kde-apps/kate/kate-21.04.49.9999.ebuild |
103 |
+++ b/kde-apps/kate/kate-21.04.49.9999.ebuild |
104 |
@@ -20,6 +20,7 @@ IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry |
105 |
|
106 |
# only addons/externaltools depends on kiconthemes, too small for USE |
107 |
DEPEND=" |
108 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
109 |
>=dev-qt/qtdbus-${QTMIN}:5 |
110 |
>=dev-qt/qtgui-${QTMIN}:5 |
111 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
112 |
@@ -61,6 +62,11 @@ DEPEND=" |
113 |
" |
114 |
RDEPEND="${DEPEND}" |
115 |
|
116 |
+PATCHES=( |
117 |
+ # bug 785412, master/21.08 |
118 |
+ "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" |
119 |
+) |
120 |
+ |
121 |
src_prepare() { |
122 |
ecm_src_prepare |
123 |
|
124 |
|
125 |
diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild |
126 |
index cbe259e071..8440e6829b 100644 |
127 |
--- a/kde-apps/kate/kate-9999.ebuild |
128 |
+++ b/kde-apps/kate/kate-9999.ebuild |
129 |
@@ -20,6 +20,7 @@ IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry |
130 |
|
131 |
# only addons/externaltools depends on kiconthemes, too small for USE |
132 |
DEPEND=" |
133 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
134 |
>=dev-qt/qtdbus-${QTMIN}:5 |
135 |
>=dev-qt/qtgui-${QTMIN}:5 |
136 |
>=dev-qt/qtwidgets-${QTMIN}:5 |