1 |
commit: 0acf1a0e0d4ac2e604ae282a894a1086c86a5df5 |
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 16:51:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acf1a0e |
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 |
Closes: 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.0-r1.ebuild | 73 ++++++++++++++++++++++ |
19 |
2 files changed, 115 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..572cc501aeb |
24 |
--- /dev/null |
25 |
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch |
26 |
@@ -0,0 +1,42 @@ |
27 |
+From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001 |
28 |
+From: Andreas Sturmlechner <asturm@g.o> |
29 |
+Date: Sat, 24 Apr 2021 18:22:10 +0200 |
30 |
+Subject: [PATCH] Add missing Qt5Concurrent |
31 |
+ |
32 |
+Implicit use via KIO. |
33 |
+ |
34 |
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
35 |
+ |
36 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
37 |
+--- |
38 |
+ CMakeLists.txt | 1 + |
39 |
+ src/CMakeLists.txt | 1 + |
40 |
+ 2 files changed, 2 insertions(+) |
41 |
+ |
42 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
43 |
+index 3c63dca..7aac0d2 100644 |
44 |
+--- a/CMakeLists.txt |
45 |
++++ b/CMakeLists.txt |
46 |
+@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR |
47 |
+ find_package( |
48 |
+ Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED |
49 |
+ Core |
50 |
++ Concurrent |
51 |
+ Widgets |
52 |
+ DBus |
53 |
+ PrintSupport |
54 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
55 |
+index 3cd737b..c715a29 100644 |
56 |
+--- a/src/CMakeLists.txt |
57 |
++++ b/src/CMakeLists.txt |
58 |
+@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/ |
59 |
+ |
60 |
+ target_link_libraries( |
61 |
+ spectacle |
62 |
++ Qt::Concurrent |
63 |
+ Qt::DBus |
64 |
+ Qt::PrintSupport |
65 |
+ KF5::CoreAddons |
66 |
+-- |
67 |
+2.31.1 |
68 |
+ |
69 |
|
70 |
diff --git a/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild |
71 |
new file mode 100644 |
72 |
index 00000000000..5e0fd693284 |
73 |
--- /dev/null |
74 |
+++ b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild |
75 |
@@ -0,0 +1,73 @@ |
76 |
+# Copyright 1999-2021 Gentoo Authors |
77 |
+# Distributed under the terms of the GNU General Public License v2 |
78 |
+ |
79 |
+EAPI=7 |
80 |
+ |
81 |
+ECM_HANDBOOK="forceoptional" |
82 |
+ECM_TEST="forceoptional" |
83 |
+PVCUT=$(ver_cut 1-3) |
84 |
+KFMIN=5.80.0 |
85 |
+QTMIN=5.15.2 |
86 |
+inherit ecm kde.org |
87 |
+ |
88 |
+DESCRIPTION="Screenshot capture utility" |
89 |
+HOMEPAGE="https://apps.kde.org/en/spectacle" |
90 |
+ |
91 |
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" |
92 |
+SLOT="5" |
93 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
94 |
+IUSE="+annotate kipi share" |
95 |
+ |
96 |
+# TODO: Qt5Svg leaking from media-libs/kimageannotator |
97 |
+DEPEND=" |
98 |
+ >=dev-qt/qdbus-${QTMIN}:5 |
99 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
100 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
101 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
102 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
103 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
104 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
105 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
106 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
107 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
108 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
109 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
110 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
111 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
112 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
113 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
114 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
115 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
116 |
+ >=kde-frameworks/kwayland-${KFMIN}:5 |
117 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
118 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
119 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
120 |
+ x11-libs/libxcb |
121 |
+ x11-libs/xcb-util |
122 |
+ x11-libs/xcb-util-cursor |
123 |
+ x11-libs/xcb-util-image |
124 |
+ annotate? ( >=media-libs/kimageannotator-0.4.1 ) |
125 |
+ kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) |
126 |
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
127 |
+" |
128 |
+RDEPEND="${DEPEND} |
129 |
+ kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) |
130 |
+" |
131 |
+ |
132 |
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785403 |
133 |
+ |
134 |
+src_prepare() { |
135 |
+ ecm_src_prepare |
136 |
+ # Unnecessary with >=media-libs/kimageannotator-0.4.0 |
137 |
+ sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \ |
138 |
+ -i CMakeLists.txt || die |
139 |
+} |
140 |
+ |
141 |
+src_configure() { |
142 |
+ local mycmakeargs=( |
143 |
+ $(cmake_use_find_package annotate kImageAnnotator) |
144 |
+ $(cmake_use_find_package kipi KF5Kipi) |
145 |
+ $(cmake_use_find_package share KF5Purpose) |
146 |
+ ) |
147 |
+ ecm_src_configure |
148 |
+} |