1 |
commit: b71d5500d0232f37748b3d5a92c3bbc75c985403 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 12 16:18:30 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 12 16:20:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71d5500 |
7 |
|
8 |
kde-plasma/plasma-desktop: Fix broken activities KCM |
9 |
|
10 |
See also: https://mail.kde.org/pipermail/distributions/2020-January/000340.html |
11 |
|
12 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
...esktop-5.17.5-revert-activities-jagginess.patch | 32 +++++ |
16 |
.../plasma-desktop/plasma-desktop-5.17.4-r2.ebuild | 143 +++++++++++++++++++++ |
17 |
.../plasma-desktop/plasma-desktop-5.17.5-r1.ebuild | 143 +++++++++++++++++++++ |
18 |
3 files changed, 318 insertions(+) |
19 |
|
20 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..fac8bab91b6 |
23 |
--- /dev/null |
24 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch |
25 |
@@ -0,0 +1,32 @@ |
26 |
+From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001 |
27 |
+From: Nate Graham <nate@×××.org> |
28 |
+Date: Sun, 12 Jan 2020 08:39:29 -0700 |
29 |
+Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on |
30 |
+ high DPI systems" |
31 |
+ |
32 |
+This reverts commit 567f71714faac305947573e307f486a9960cf1d1. |
33 |
+ |
34 |
+The commit in question was pushed without review and should not have |
35 |
+been. It worked fine for me in local testing but somehow was broken |
36 |
+anyway. Sorry. :( |
37 |
+ |
38 |
+BUG: 416158 |
39 |
+--- |
40 |
+ kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 -- |
41 |
+ 1 file changed, 2 deletions(-) |
42 |
+ |
43 |
+diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml |
44 |
+index 531ef9f..aac13a2 100644 |
45 |
+--- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml |
46 |
++++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml |
47 |
+@@ -52,8 +52,6 @@ ColumnLayout { |
48 |
+ height: Kirigami.Units.iconSizes.medium |
49 |
+ width: height |
50 |
+ source: model.icon |
51 |
+- sourceSize.width: model.icon.width |
52 |
+- sourceSize.height: model.icon.height |
53 |
+ } |
54 |
+ |
55 |
+ QQC2.Label { |
56 |
+-- |
57 |
+cgit v1.1 |
58 |
|
59 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild |
60 |
new file mode 100644 |
61 |
index 00000000000..eb00ab2ef8a |
62 |
--- /dev/null |
63 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild |
64 |
@@ -0,0 +1,143 @@ |
65 |
+# Copyright 1999-2020 Gentoo Authors |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+EAPI=7 |
69 |
+ |
70 |
+ECM_HANDBOOK="forceoptional" |
71 |
+ECM_TEST="true" |
72 |
+VIRTUALX_REQUIRED="test" |
73 |
+KFMIN=5.64.0 |
74 |
+PVCUT=$(ver_cut 1-3) |
75 |
+QTMIN=5.12.3 |
76 |
+inherit ecm kde.org |
77 |
+ |
78 |
+DESCRIPTION="KDE Plasma desktop" |
79 |
+LICENSE="GPL-2" # TODO: CHECK |
80 |
+SLOT="5" |
81 |
+KEYWORDS="amd64 ~arm arm64 x86" |
82 |
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad" |
83 |
+ |
84 |
+COMMON_DEPEND=" |
85 |
+ >=kde-frameworks/attica-${KFMIN}:5 |
86 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
87 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
88 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
89 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
90 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
91 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
92 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
93 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
94 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
95 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
97 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
99 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
101 |
+ >=kde-frameworks/kemoticons-${KFMIN}:5 |
102 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
104 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
105 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
106 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
107 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
108 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
109 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
110 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
111 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
112 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
113 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
114 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
115 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
116 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
117 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
118 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
119 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
120 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
121 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
122 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
123 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
124 |
+ >=kde-plasma/plasma-workspace-${PVCUT}:5 |
125 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
126 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
127 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
128 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
129 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
130 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
131 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
132 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
133 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
134 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
135 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
136 |
+ media-libs/phonon[qt5(+)] |
137 |
+ x11-libs/libX11 |
138 |
+ x11-libs/libXcursor |
139 |
+ x11-libs/libXfixes |
140 |
+ x11-libs/libXi |
141 |
+ x11-libs/libxcb[xkb] |
142 |
+ x11-libs/libxkbfile |
143 |
+ fontconfig? ( |
144 |
+ media-libs/fontconfig |
145 |
+ media-libs/freetype |
146 |
+ x11-libs/libXft |
147 |
+ x11-libs/xcb-util-image |
148 |
+ ) |
149 |
+ ibus? ( |
150 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
151 |
+ app-i18n/ibus |
152 |
+ dev-libs/glib:2 |
153 |
+ x11-libs/libxcb |
154 |
+ x11-libs/xcb-util-keysyms |
155 |
+ ) |
156 |
+ scim? ( app-i18n/scim ) |
157 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
158 |
+ touchpad? ( x11-drivers/xf86-input-synaptics ) |
159 |
+" |
160 |
+DEPEND="${COMMON_DEPEND} |
161 |
+ dev-libs/boost |
162 |
+ x11-base/xorg-proto |
163 |
+ fontconfig? ( x11-libs/libXrender ) |
164 |
+ mouse? ( |
165 |
+ x11-drivers/xf86-input-evdev |
166 |
+ x11-drivers/xf86-input-libinput |
167 |
+ ) |
168 |
+" |
169 |
+RDEPEND="${COMMON_DEPEND} |
170 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
171 |
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
172 |
+ >=kde-plasma/breeze-${PVCUT}:5 |
173 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
174 |
+ >=kde-plasma/oxygen-${PVCUT}:5 |
175 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
176 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
177 |
+ sys-apps/util-linux |
178 |
+ x11-apps/setxkbmap |
179 |
+ !<kde-plasma/kdeplasma-addons-5.15.80 |
180 |
+" |
181 |
+ |
182 |
+PATCHES=( "${FILESDIR}"/${P}-pager-regression.patch ) |
183 |
+ |
184 |
+src_configure() { |
185 |
+ local mycmakeargs=( |
186 |
+ $(cmake_use_find_package fontconfig Fontconfig) |
187 |
+ $(cmake_use_find_package ibus IBus) |
188 |
+ $(cmake_use_find_package mouse Evdev) |
189 |
+ $(cmake_use_find_package mouse XorgLibinput) |
190 |
+ $(cmake_use_find_package scim SCIM) |
191 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
192 |
+ $(cmake_use_find_package touchpad Synaptics) |
193 |
+ ) |
194 |
+ |
195 |
+ ecm_src_configure |
196 |
+} |
197 |
+ |
198 |
+src_test() { |
199 |
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
200 |
+ # needs D-Bus, bug #634166 |
201 |
+ local myctestargs=( |
202 |
+ -j1 |
203 |
+ -E "(foldermodeltest|positionertest|test_kio_fonts)" |
204 |
+ ) |
205 |
+ |
206 |
+ ecm_src_test |
207 |
+} |
208 |
|
209 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild |
210 |
new file mode 100644 |
211 |
index 00000000000..7ca44857dd8 |
212 |
--- /dev/null |
213 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild |
214 |
@@ -0,0 +1,143 @@ |
215 |
+# Copyright 1999-2020 Gentoo Authors |
216 |
+# Distributed under the terms of the GNU General Public License v2 |
217 |
+ |
218 |
+EAPI=7 |
219 |
+ |
220 |
+ECM_HANDBOOK="forceoptional" |
221 |
+ECM_TEST="true" |
222 |
+VIRTUALX_REQUIRED="test" |
223 |
+KFMIN=5.64.0 |
224 |
+PVCUT=$(ver_cut 1-3) |
225 |
+QTMIN=5.12.3 |
226 |
+inherit ecm kde.org |
227 |
+ |
228 |
+DESCRIPTION="KDE Plasma desktop" |
229 |
+LICENSE="GPL-2" # TODO: CHECK |
230 |
+SLOT="5" |
231 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
232 |
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad" |
233 |
+ |
234 |
+COMMON_DEPEND=" |
235 |
+ >=kde-frameworks/attica-${KFMIN}:5 |
236 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
237 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
238 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
239 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
240 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
241 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
242 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
243 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
244 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
245 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
246 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
247 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
248 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
249 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
250 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
251 |
+ >=kde-frameworks/kemoticons-${KFMIN}:5 |
252 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
253 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
254 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
255 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
256 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
257 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
258 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
259 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
260 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
261 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
262 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
263 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
264 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
265 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
266 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
267 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
268 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
269 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
270 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
271 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
272 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
273 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
274 |
+ >=kde-plasma/plasma-workspace-${PVCUT}:5 |
275 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
276 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
277 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
278 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
279 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
280 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
281 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
282 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
283 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
284 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
285 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
286 |
+ media-libs/phonon[qt5(+)] |
287 |
+ x11-libs/libX11 |
288 |
+ x11-libs/libXcursor |
289 |
+ x11-libs/libXfixes |
290 |
+ x11-libs/libXi |
291 |
+ x11-libs/libxcb[xkb] |
292 |
+ x11-libs/libxkbfile |
293 |
+ fontconfig? ( |
294 |
+ media-libs/fontconfig |
295 |
+ media-libs/freetype |
296 |
+ x11-libs/libXft |
297 |
+ x11-libs/xcb-util-image |
298 |
+ ) |
299 |
+ ibus? ( |
300 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
301 |
+ app-i18n/ibus |
302 |
+ dev-libs/glib:2 |
303 |
+ x11-libs/libxcb |
304 |
+ x11-libs/xcb-util-keysyms |
305 |
+ ) |
306 |
+ scim? ( app-i18n/scim ) |
307 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
308 |
+ touchpad? ( x11-drivers/xf86-input-synaptics ) |
309 |
+" |
310 |
+DEPEND="${COMMON_DEPEND} |
311 |
+ dev-libs/boost |
312 |
+ x11-base/xorg-proto |
313 |
+ fontconfig? ( x11-libs/libXrender ) |
314 |
+ mouse? ( |
315 |
+ x11-drivers/xf86-input-evdev |
316 |
+ x11-drivers/xf86-input-libinput |
317 |
+ ) |
318 |
+" |
319 |
+RDEPEND="${COMMON_DEPEND} |
320 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
321 |
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
322 |
+ >=kde-plasma/breeze-${PVCUT}:5 |
323 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
324 |
+ >=kde-plasma/oxygen-${PVCUT}:5 |
325 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
326 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
327 |
+ sys-apps/util-linux |
328 |
+ x11-apps/setxkbmap |
329 |
+ !<kde-plasma/kdeplasma-addons-5.15.80 |
330 |
+" |
331 |
+ |
332 |
+PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch ) |
333 |
+ |
334 |
+src_configure() { |
335 |
+ local mycmakeargs=( |
336 |
+ $(cmake_use_find_package fontconfig Fontconfig) |
337 |
+ $(cmake_use_find_package ibus IBus) |
338 |
+ $(cmake_use_find_package mouse Evdev) |
339 |
+ $(cmake_use_find_package mouse XorgLibinput) |
340 |
+ $(cmake_use_find_package scim SCIM) |
341 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
342 |
+ $(cmake_use_find_package touchpad Synaptics) |
343 |
+ ) |
344 |
+ |
345 |
+ ecm_src_configure |
346 |
+} |
347 |
+ |
348 |
+src_test() { |
349 |
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
350 |
+ # needs D-Bus, bug #634166 |
351 |
+ local myctestargs=( |
352 |
+ -j1 |
353 |
+ -E "(foldermodeltest|positionertest|test_kio_fonts)" |
354 |
+ ) |
355 |
+ |
356 |
+ ecm_src_test |
357 |
+} |