Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
Date: Wed, 01 Feb 2023 09:47:39
Message-Id: 1675243595.7a98b6427a2ddb8b8a88543db1429ae5ee2eea99.asturm@gentoo
1 commit: 7a98b6427a2ddb8b8a88543db1429ae5ee2eea99
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 08:31:47 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 09:26:35 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a98b642
7
8 kde-plasma/plasma-desktop: drop 5.25.5-r2
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-plasma/plasma-desktop/Manifest | 1 -
13 ....5-desktoptoolbox-fix-flickering-on-close.patch | 30 ----
14 ...5.5-folderview-fix-grid-overflow-property.patch | 40 -----
15 .../plasma-desktop-5.25.5-lock-layout-check.patch | 23 ---
16 .../files/plasma-desktop-5.25.5-lock-layout.patch | 48 ------
17 .../plasma-desktop/plasma-desktop-5.25.5-r2.ebuild | 182 ---------------------
18 6 files changed, 324 deletions(-)
19
20 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
21 index 1c2ea3e5cf0f..034d5d91c844 100644
22 --- a/kde-plasma/plasma-desktop/Manifest
23 +++ b/kde-plasma/plasma-desktop/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B b0693b2097b3cbee01c82c19b803c64401139a5206014de5ceaa17a253de159948d93b870910d37d205989e99e66f245480ca1c79b09338babc0d56eef387399 SHA512 8bcf570ae73c21af7780706a33cf905bd566465badb457cc64515717c01ed332cd8543ca353a82222abdc8b63a762ae85d7881706742b3fe8f93c77584261ec4
26 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
27 DIST plasma-desktop-5.26.90.tar.xz 14324860 BLAKE2B 4f3efe89651c71799d9df6319801c355fc61455782a303e575b6fcfeee568201e70c6934b3f5e2955709717e1e06bafd498f49621c6e3268580b423692550772 SHA512 4db4e0807aa71dbebd74f6c8354a8d203d45116dab6ba1e3580fa66678344db5368762df17defe52417f49db708a0090f0485edda7fed98f7e8e3294110338bf
28 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
29
30 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
31 deleted file mode 100644
32 index ca7627d6c33b..000000000000
33 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
34 +++ /dev/null
35 @@ -1,30 +0,0 @@
36 -From 5f384e75bef57231fe01155da479375c315a9706 Mon Sep 17 00:00:00 2001
37 -From: Fushan Wen <qydwhotmail@×××××.com>
38 -Date: Wed, 21 Sep 2022 20:06:08 +0800
39 -Subject: [PATCH] desktoptoolbox: fix flickering on closing
40 -
41 -The visible property needs to keep true until opacity becomes 0,
42 -otherwise the toolbox will flicker on closing.
43 -
44 -BUG: 417849
45 -FIXED-IN: 5.26 5.24.7
46 ----
47 - toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml | 2 +-
48 - 1 file changed, 1 insertion(+), 1 deletion(-)
49 -
50 -diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
51 -index 2cdea674b..b3f306e8c 100644
52 ---- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
53 -+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
54 -@@ -32,7 +32,7 @@ Item {
55 - }
56 - transformOrigin: Item.Center
57 - opacity: plasmoid.editMode
58 -- visible: plasmoid.editMode
59 -+ visible: opacity > 0
60 - Behavior on opacity {
61 - OpacityAnimator {
62 - duration: PlasmaCore.Units.longDuration
63 ---
64 -GitLab
65 -
66
67 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
68 deleted file mode 100644
69 index 40d34cad1bf1..000000000000
70 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
71 +++ /dev/null
72 @@ -1,40 +0,0 @@
73 -From cb3cbbe3b07da0c9e35cdef69343d32f7659f550 Mon Sep 17 00:00:00 2001
74 -From: Arjen Hiemstra <ahiemstra@×××××.nl>
75 -Date: Thu, 15 Sep 2022 17:08:00 +0200
76 -Subject: [PATCH] folderview: Fix grid overflow property so it properly reports
77 - overflow state
78 -
79 -In some cases, viewportArea.widthRatio or heightRatio can be 0 when it's
80 -not actually overflowing. So account for that to ensure we properly
81 -report the overflow state.
82 -
83 -BUG: 419878
84 -
85 -
86 -(cherry picked from commit 754e229b83708c1b8c7be547ef2dcf5645bafc21)
87 ----
88 - containments/desktop/package/contents/ui/FolderView.qml | 8 +++++++-
89 - 1 file changed, 7 insertions(+), 1 deletion(-)
90 -
91 -diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
92 -index 72ae4903a..a057a5099 100644
93 ---- a/containments/desktop/package/contents/ui/FolderView.qml
94 -+++ b/containments/desktop/package/contents/ui/FolderView.qml
95 -@@ -657,7 +657,13 @@ FocusScope {
96 - property bool ctrlPressed: false
97 - property bool shiftPressed: false
98 -
99 -- property bool overflowing: (visibleArea.heightRatio < 1.0 || visibleArea.widthRatio < 1.0)
100 -+ property bool overflowing: {
101 -+ // widthRatio or heightRatio may be 0 when it's not actually
102 -+ // overflowing, so account for that.
103 -+ let widthOverflow = visibleArea.widthRatio > 0.0 && visibleArea.widthRatio < 1.0
104 -+ let heightOverflow = visibleArea.heightRatio > 0.0 && visibleArea.heightRatio < 1.0
105 -+ return widthOverflow || heightOverflow
106 -+ }
107 -
108 - property bool scrollLeft: false
109 - property bool scrollRight: false
110 ---
111 -GitLab
112 -
113
114 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
115 deleted file mode 100644
116 index c476090ed1ea..000000000000
117 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
118 +++ /dev/null
119 @@ -1,23 +0,0 @@
120 -https://invent.kde.org/plasma/plasma-desktop/-/commit/7e1dec42ba12cdbf768ba7fba613e837d645b02c
121 -
122 -From 7e1dec42ba12cdbf768ba7fba613e837d645b02c Mon Sep 17 00:00:00 2001
123 -From: Marco Martin <notmart@×××××.com>
124 -Date: Sun, 25 Sep 2022 16:28:59 -0500
125 -Subject: [PATCH] remove the check for > 0
126 -
127 ---- a/containments/desktop/package/contents/ui/main.qml
128 -+++ b/containments/desktop/package/contents/ui/main.qml
129 -@@ -85,10 +85,10 @@ FolderViewDropArea {
130 - topMargin: (isContainment && plasmoid.availableScreenRect) ? plasmoid.availableScreenRect.y : 0
131 -
132 - rightMargin: (isContainment && plasmoid.availableScreenRect) && parent
133 -- ? Math.max(0, parent.width - (plasmoid.availableScreenRect.x + plasmoid.availableScreenRect.width)) : 0
134 -+ ? parent.width - (plasmoid.availableScreenRect.x + plasmoid.availableScreenRect.width) : 0
135 -
136 - bottomMargin: (isContainment && plasmoid.availableScreenRect) && parent
137 -- ? Math.max(0, parent.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height)) : 0
138 -+ ? parent.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height) : 0
139 - }
140 -
141 - Behavior on anchors.topMargin {
142 -GitLab
143
144 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
145 deleted file mode 100644
146 index 292712a8060e..000000000000
147 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
148 +++ /dev/null
149 @@ -1,48 +0,0 @@
150 -https://invent.kde.org/plasma/plasma-desktop/-/commit/234cd860532449f017ecbbca6a8caad5473fcf8b
151 -
152 -From 234cd860532449f017ecbbca6a8caad5473fcf8b Mon Sep 17 00:00:00 2001
153 -From: Marco Martin <notmart@×××××.com>
154 -Date: Sun, 25 Sep 2022 16:27:13 -0500
155 -Subject: [PATCH] Use relayout locking
156 -
157 -This makes use of the layout locking freature introduced in
158 -
159 -The resize of the layout area can happen either by screen resolution
160 -change or available screen area change (a panel appears or is resized)
161 -This is not an atomic operation, as width and height are usually set in
162 -2 different operations, and even worse the layout area is resized to
163 - match the available one with an animation, so many intermediate resizes
164 -that should never cause a relayout happen.
165 -A compression timer limits the actual relayouts to hopefully one,
166 - but if the system is really slowed down
167 -(for instance, startup) the timer may expire and cause relayouts in
168 -non useful sizes, losing the needed configuration
169 -The lock blocks all relayout and config writes when the size of the
170 -layout area doesn't correspond to corona availablescreenrect, which are
171 -the only "settled" cases.
172 -
173 -BUG:413645
174 ---- a/containments/desktop/package/contents/ui/main.qml
175 -+++ b/containments/desktop/package/contents/ui/main.qml
176 -@@ -85,10 +85,10 @@ FolderViewDropArea {
177 - topMargin: (isContainment && plasmoid.availableScreenRect) ? plasmoid.availableScreenRect.y : 0
178 -
179 - rightMargin: (isContainment && plasmoid.availableScreenRect) && parent
180 -- ? parent.width - (plasmoid.availableScreenRect.x + plasmoid.availableScreenRect.width) : 0
181 -+ ? Math.max(0, parent.width - (plasmoid.availableScreenRect.x + plasmoid.availableScreenRect.width)) : 0
182 -
183 - bottomMargin: (isContainment && plasmoid.availableScreenRect) && parent
184 -- ? parent.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height) : 0
185 -+ ? Math.max(0, parent.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height)) : 0
186 - }
187 -
188 - Behavior on anchors.topMargin {
189 -@@ -263,6 +263,7 @@ FolderViewDropArea {
190 - ContainmentLayoutManager.AppletsLayout {
191 - id: appletsLayout
192 - anchors.fill: parent
193 -+ relayoutLock: width != plasmoid.availableScreenRect.width || height != plasmoid.availableScreenRect.height
194 - // NOTE: use plasmoid.availableScreenRect and not own width and height as they are updated not atomically
195 - configKey: "ItemGeometries-" + Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
196 - fallbackConfigKey: plasmoid.availableScreenRect.width > plasmoid.availableScreenRect.height ? "ItemGeometriesHorizontal" : "ItemGeometriesVertical"
197 -GitLab
198
199 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
200 deleted file mode 100644
201 index 82c081a2a29e..000000000000
202 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
203 +++ /dev/null
204 @@ -1,182 +0,0 @@
205 -# Copyright 1999-2022 Gentoo Authors
206 -# Distributed under the terms of the GNU General Public License v2
207 -
208 -EAPI=8
209 -
210 -ECM_HANDBOOK="forceoptional"
211 -ECM_TEST="true"
212 -KFMIN=5.99.0
213 -PVCUT=$(ver_cut 1-3)
214 -QTMIN=5.15.5
215 -VIRTUALX_REQUIRED="test"
216 -inherit ecm plasma.kde.org optfeature
217 -
218 -DESCRIPTION="KDE Plasma desktop"
219 -XORGHDRS="${PN}-override-include-dirs-2"
220 -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
221 -
222 -LICENSE="GPL-2" # TODO: CHECK
223 -SLOT="5"
224 -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
225 -IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
226 -
227 -COMMON_DEPEND="
228 - >=dev-qt/qtconcurrent-${QTMIN}:5
229 - >=dev-qt/qtdbus-${QTMIN}:5
230 - >=dev-qt/qtdeclarative-${QTMIN}:5
231 - >=dev-qt/qtgui-${QTMIN}:5
232 - >=dev-qt/qtnetwork-${QTMIN}:5
233 - >=dev-qt/qtprintsupport-${QTMIN}:5
234 - >=dev-qt/qtsql-${QTMIN}:5
235 - >=dev-qt/qtsvg-${QTMIN}:5
236 - >=dev-qt/qtwidgets-${QTMIN}:5
237 - >=dev-qt/qtx11extras-${QTMIN}:5
238 - >=dev-qt/qtxml-${QTMIN}:5
239 - >=kde-frameworks/attica-${KFMIN}:5
240 - >=kde-frameworks/kactivities-${KFMIN}:5
241 - >=kde-frameworks/kactivities-stats-${KFMIN}:5
242 - >=kde-frameworks/karchive-${KFMIN}:5
243 - >=kde-frameworks/kauth-${KFMIN}:5
244 - >=kde-frameworks/kbookmarks-${KFMIN}:5
245 - >=kde-frameworks/kcmutils-${KFMIN}:5
246 - >=kde-frameworks/kcodecs-${KFMIN}:5
247 - >=kde-frameworks/kcompletion-${KFMIN}:5
248 - >=kde-frameworks/kconfig-${KFMIN}:5
249 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
250 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
251 - >=kde-frameworks/kcrash-${KFMIN}:5
252 - >=kde-frameworks/kdbusaddons-${KFMIN}:5
253 - >=kde-frameworks/kdeclarative-${KFMIN}:5
254 - >=kde-frameworks/kded-${KFMIN}:5
255 - >=kde-frameworks/kdelibs4support-${KFMIN}:5
256 - >=kde-frameworks/kglobalaccel-${KFMIN}:5
257 - >=kde-frameworks/kguiaddons-${KFMIN}:5
258 - >=kde-frameworks/ki18n-${KFMIN}:5
259 - >=kde-frameworks/kiconthemes-${KFMIN}:5
260 - >=kde-frameworks/kio-${KFMIN}:5
261 - >=kde-frameworks/kitemmodels-${KFMIN}:5
262 - >=kde-frameworks/kitemviews-${KFMIN}:5
263 - >=kde-frameworks/kjobwidgets-${KFMIN}:5
264 - >=kde-frameworks/knewstuff-${KFMIN}:5
265 - >=kde-frameworks/knotifications-${KFMIN}:5
266 - >=kde-frameworks/knotifyconfig-${KFMIN}:5
267 - >=kde-frameworks/kparts-${KFMIN}:5
268 - >=kde-frameworks/krunner-${KFMIN}:5
269 - >=kde-frameworks/kservice-${KFMIN}:5
270 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
271 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
272 - >=kde-frameworks/kxmlgui-${KFMIN}:5
273 - >=kde-frameworks/plasma-${KFMIN}:5
274 - >=kde-frameworks/solid-${KFMIN}:5
275 - >=kde-frameworks/sonnet-${KFMIN}:5
276 - >=kde-plasma/kwin-${PVCUT}:5
277 - >=kde-plasma/libksysguard-${PVCUT}:5
278 - >=kde-plasma/libkworkspace-${PVCUT}:5
279 - >=kde-plasma/plasma-workspace-${PVCUT}:5
280 - >=media-libs/phonon-4.11.0
281 - x11-libs/libX11
282 - x11-libs/libXfixes
283 - x11-libs/libXi
284 - x11-libs/libxcb
285 - x11-libs/libxkbfile
286 - emoji? (
287 - app-i18n/ibus[emoji]
288 - dev-libs/glib:2
289 - media-fonts/noto-emoji
290 - )
291 - ibus? (
292 - app-i18n/ibus
293 - dev-libs/glib:2
294 - >=dev-qt/qtx11extras-${QTMIN}:5
295 - x11-libs/libxcb
296 - x11-libs/xcb-util-keysyms
297 - )
298 - kaccounts? (
299 - kde-apps/kaccounts-integration:5
300 - net-libs/accounts-qt
301 - )
302 - scim? ( app-i18n/scim )
303 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
304 - telemetry? ( dev-libs/kuserfeedback:5 )
305 -"
306 -DEPEND="${COMMON_DEPEND}
307 - dev-libs/boost
308 - x11-base/xorg-proto
309 -"
310 -RDEPEND="${COMMON_DEPEND}
311 - !kde-plasma/user-manager
312 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5
313 - >=dev-qt/qtquickcontrols2-${QTMIN}:5
314 - >=kde-frameworks/kirigami-${KFMIN}:5
315 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
316 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
317 - >=kde-plasma/oxygen-${PVCUT}:5
318 - sys-apps/util-linux
319 - x11-apps/setxkbmap
320 - x11-misc/xdg-user-dirs
321 - kaccounts? ( net-libs/signon-oauth2 )
322 -"
323 -BDEPEND="virtual/pkgconfig"
324 -
325 -PATCHES=(
326 - "${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
327 - "${FILESDIR}/${P}-desktoptoolbox-fix-flickering-on-close.patch" # KDE-bug 417849
328 - "${FILESDIR}/${P}-folderview-fix-grid-overflow-property.patch" # KDE-bug 419878
329 - "${FILESDIR}/${P}-lock-layout.patch" # KDE-bug 413645
330 - "${FILESDIR}/${P}-lock-layout-check.patch"
331 -)
332 -
333 -src_prepare() {
334 - ecm_src_prepare
335 -
336 - if ! use ibus; then
337 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
338 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
339 - fi
340 -
341 - use emoji || cmake_run_in applets/kimpanel/backend/ibus \
342 - cmake_comment_add_subdirectory emojier
343 -
344 - # TODO: try to get a build switch upstreamed
345 - if ! use scim; then
346 - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
347 - fi
348 -}
349 -
350 -src_configure() {
351 - local mycmakeargs=(
352 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
353 - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
354 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
355 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
356 - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
357 - $(cmake_use_find_package kaccounts AccountsQt5)
358 - $(cmake_use_find_package kaccounts KAccounts)
359 - $(cmake_use_find_package semantic-desktop KF5Baloo)
360 - $(cmake_use_find_package telemetry KUserFeedback)
361 - )
362 - if ! use emoji && ! use ibus; then
363 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
364 - fi
365 -
366 - ecm_src_configure
367 -}
368 -
369 -src_test() {
370 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
371 - # test_kio_fonts needs D-Bus, bug #634166
372 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
373 - local myctestargs=(
374 - -j1
375 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
376 - )
377 -
378 - ecm_src_test
379 -}
380 -
381 -pkg_postinst() {
382 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
383 - optfeature "screen reader support" app-accessibility/orca
384 - fi
385 - ecm_pkg_postinst
386 -}