1 |
commit: ec04f143e0af83769d7fc9150385fea4c76d1bfb |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 24 16:31:16 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 24 18:03:05 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec04f143 |
7 |
|
8 |
kde-apps/spectacle: Fix and add implicit dependency |
9 |
|
10 |
See also: https://invent.kde.org/graphics/spectacle/-/merge_requests/63 |
11 |
|
12 |
Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com> |
13 |
Bug: https://bugs.gentoo.org/785403 |
14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../files/spectacle-21.04.0-implicit-dep.patch | 42 ++++++++++++++++++++++ |
18 |
kde-apps/spectacle/spectacle-21.04.49.9999.ebuild | 3 ++ |
19 |
kde-apps/spectacle/spectacle-9999.ebuild | 1 + |
20 |
3 files changed, 46 insertions(+) |
21 |
|
22 |
diff --git a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch |
23 |
new file mode 100644 |
24 |
index 0000000000..572cc501ae |
25 |
--- /dev/null |
26 |
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch |
27 |
@@ -0,0 +1,42 @@ |
28 |
+From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001 |
29 |
+From: Andreas Sturmlechner <asturm@g.o> |
30 |
+Date: Sat, 24 Apr 2021 18:22:10 +0200 |
31 |
+Subject: [PATCH] Add missing Qt5Concurrent |
32 |
+ |
33 |
+Implicit use via KIO. |
34 |
+ |
35 |
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
36 |
+ |
37 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
38 |
+--- |
39 |
+ CMakeLists.txt | 1 + |
40 |
+ src/CMakeLists.txt | 1 + |
41 |
+ 2 files changed, 2 insertions(+) |
42 |
+ |
43 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
44 |
+index 3c63dca..7aac0d2 100644 |
45 |
+--- a/CMakeLists.txt |
46 |
++++ b/CMakeLists.txt |
47 |
+@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR |
48 |
+ find_package( |
49 |
+ Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED |
50 |
+ Core |
51 |
++ Concurrent |
52 |
+ Widgets |
53 |
+ DBus |
54 |
+ PrintSupport |
55 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
56 |
+index 3cd737b..c715a29 100644 |
57 |
+--- a/src/CMakeLists.txt |
58 |
++++ b/src/CMakeLists.txt |
59 |
+@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/ |
60 |
+ |
61 |
+ target_link_libraries( |
62 |
+ spectacle |
63 |
++ Qt::Concurrent |
64 |
+ Qt::DBus |
65 |
+ Qt::PrintSupport |
66 |
+ KF5::CoreAddons |
67 |
+-- |
68 |
+2.31.1 |
69 |
+ |
70 |
|
71 |
diff --git a/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild b/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild |
72 |
index 63a53f4372..96dd332ac3 100644 |
73 |
--- a/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild |
74 |
+++ b/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild |
75 |
@@ -21,6 +21,7 @@ IUSE="+annotate kipi share" |
76 |
# TODO: Qt5Svg leaking from media-libs/kimageannotator |
77 |
DEPEND=" |
78 |
>=dev-qt/qdbus-${QTMIN}:5 |
79 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
80 |
>=dev-qt/qtdbus-${QTMIN}:5 |
81 |
>=dev-qt/qtgui-${QTMIN}:5 |
82 |
>=dev-qt/qtsvg-${QTMIN}:5 |
83 |
@@ -53,6 +54,8 @@ RDEPEND="${DEPEND} |
84 |
kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) |
85 |
" |
86 |
|
87 |
+PATCHES=( "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" ) # bug 785403 |
88 |
+ |
89 |
src_prepare() { |
90 |
ecm_src_prepare |
91 |
# Unnecessary with >=media-libs/kimageannotator-0.4.0 |
92 |
|
93 |
diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild |
94 |
index a85c59ecc6..25d53c60f0 100644 |
95 |
--- a/kde-apps/spectacle/spectacle-9999.ebuild |
96 |
+++ b/kde-apps/spectacle/spectacle-9999.ebuild |
97 |
@@ -21,6 +21,7 @@ IUSE="+annotate kipi share" |
98 |
# TODO: Qt5Svg leaking from media-libs/kimageannotator |
99 |
DEPEND=" |
100 |
>=dev-qt/qdbus-${QTMIN}:5 |
101 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
102 |
>=dev-qt/qtdbus-${QTMIN}:5 |
103 |
>=dev-qt/qtgui-${QTMIN}:5 |
104 |
>=dev-qt/qtsvg-${QTMIN}:5 |