gentoo auto-resync : 08:08:2022 - 02:12:59

10 files changed, 557 insertions, 2 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4fd30baa7c8e..a441053936bc 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 036ef0c7df26..187cc93da099 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,11 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
+AUX kwin-5.24.6-drm-fix-blob-updating.patch 1096 BLAKE2B 1d9492147732110b9835ff25d7ee3c24eaf9ec145676b95782a94a3972b4766686f1a8b591f272250c8dc4958b686b510cec9ad21db7c39801d02150f7f4dc0a SHA512 d451ac0371e1c467a9f7033faccebfe29adc82977dcbddfd892eca5913ef8df22f7bc0addab42f36e39467d71022c7862e0b33e39f1f800347ddf21d3265b6a1
 AUX kwin-5.24.6-emit-rowsChanged.patch 999 BLAKE2B ed3519679b81e56a4c52e7d20b91516cefeaa4c4cdb432795edeb9fb8f98aba0ec720662966a2b9ff764ec3bf5126ab2aafe08a209dac826b30dc0139737cc6b SHA512 f6b865aededd119fed69b19d994604179de0ac69efbbefc300872a396125bb3acd635b2784dd54ab961d517b5752e2520c7e2c701263abbc47c3ca3335d44bb3
 AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed33134db8d10c9a1e3f2e936d7a4375d9eef2f6f41c64a3c584187ef8b0e7cbd2b91f0f3248f462bf5093a17108f27722bbdf7afd SHA512 77cc88b24baaadbcd0737a8bd2a8b14f5f2b4f5bd7348553c67d406032ba886720b448691ba9c99c12e1da41f5af31752955caaa43f2f75064816ca4f739b105
+AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a5682eab739f99f86fdcbffb6577f9cfdffd815c32f58cb7b891c2305c7ddce20fa5456524061f51f3084a77e6d64d0ff81ddc79fb SHA512 54cfcc6f72151787c7b22efb629dfbbd8e5af1b05567071b3aa2f11caf3c65295127e5fa1529763157971f6d707c4078c28d9cddd5bb0f244b774f20a734e08c
 DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
 DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
 EBUILD kwin-5.24.6-r1.ebuild 4126 BLAKE2B 4f12925511011887954c13882f644182eb24dbbe9c39d58974be95565afdfa48b8d770f382b614a7a45439cdce8c1c2229ed2b486aa4c7724a8c352bfd87a7f6 SHA512 79bba7223739f8b61744feaead7eca554d526e0d1c8e84e61c2f1f73d05c645767221ecd77a6e292f0c9bb97da9734faaeafb01c92aa51e2d5cafb25d6c724c1
-EBUILD kwin-5.25.4.ebuild 4181 BLAKE2B eef592139d6af524533aa989206225cd5cfe0c8c82d99188b4af762630e9b0557923fbf114f10fe944ac35d657a35d7bb1103689f55ec747dfefe14a18f9f58c SHA512 1ac7e4dc4227204bc5a3fe082dcf4487712c0d97a669f8dc14856d493681f54e16fb33a652cebf70fe9abed9d0449002cc478896dd6ada5e03c94bd25ead25df
+EBUILD kwin-5.24.6-r2.ebuild 4197 BLAKE2B 612d968998bf813f24a41a7f6a3375a45a357f30aa54e159a55b38f963592d920809c664ee103ea516bccc01792a15d427cd576779252d411977338e3dec149a SHA512 53301d5bea61c3c60768e6437566ed6df528880c54eb879a91b53f12699fc11e29ec3a3dd4c700ad1c44044d9533e08446a11e282d18472ed22c928e70a194f8
+EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch
new file mode 100644
index 000000000000..45d231a70f1b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch
@@ -0,0 +1,38 @@
+From 3af37c8a29af36eb773b0684237d61b2bd6b81f9 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 4 Aug 2022 15:36:26 +0200
+Subject: [PATCH] backends/drm: fix blob updating
+
+Two things about the code were wrong:
+1. m_current is used in updateBlob() but was only updated afterwards
+2. the assumption that the property having the same ID means it has the
+same blob contents is not always true
+
+BUG: 449285
+
+
+(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea)
+---
+ src/backends/drm/drm_property.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
+index 8ab0dc0e5a..b2a2deda12 100644
+--- a/src/backends/drm/drm_property.cpp
++++ b/src/backends/drm/drm_property.cpp
+@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const
+ 
+ void DrmProperty::setCurrent(uint64_t value)
+ {
+-    if (m_current != value) {
+-        updateBlob();
+-        m_current = value;
+-    }
++    m_current = value;
++    updateBlob();
+ }
+ 
+ uint64_t DrmProperty::current() const
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
new file mode 100644
index 000000000000..282913620c7b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
@@ -0,0 +1,38 @@
+From 9a81567777f94e2e6c1a121f1d86dd2bdea83adf Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 4 Aug 2022 15:36:26 +0200
+Subject: [PATCH] backends/drm: fix blob updating
+
+Two things about the code were wrong:
+1. m_current is used in updateBlob() but was only updated afterwards
+2. the assumption that the property having the same ID means it has the
+same blob contents is not always true
+
+BUG: 449285
+
+
+(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea)
+---
+ src/backends/drm/drm_property.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
+index c9f7718abd..cee80d043a 100644
+--- a/src/backends/drm/drm_property.cpp
++++ b/src/backends/drm/drm_property.cpp
+@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const
+ 
+ void DrmProperty::setCurrent(uint64_t value)
+ {
+-    if (m_current != value) {
+-        updateBlob();
+-        m_current = value;
+-    }
++    m_current = value;
++    updateBlob();
+ }
+ 
+ uint64_t DrmProperty::current() const
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
new file mode 100644
index 000000000000..bb3d86644b6b
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.19
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libepoxy
+	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	sys-apps/hwdata
+	x11-base/xwayland
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	test? (
+		dev-libs/plasma-wayland-protocols
+		>=dev-libs/wayland-protocols-1.19
+	)
+"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-emit-rowsChanged.patch"
+	"${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974
+	"${FILESDIR}/${P}-drm-fix-blob-updating.patch" # KDE-bug 449285
+)
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwin/kwin-5.25.4.ebuild b/kde-plasma/kwin/kwin-5.25.4-r1.ebuild
index cbcf91423b84..44b1802e9117 100644
--- a/kde-plasma/kwin/kwin-5.25.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.25.4-r1.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kidletime-${KFMIN}:5=
 	>=kde-frameworks/kitemviews-${KFMIN}:5
@@ -102,6 +102,8 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=( "${FILESDIR}/${P}-drm-fix-blob-updating.patch" ) # KDE-bug 449285
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4fef10e8ed96..03574a11b71b 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,9 @@
+AUX plasma-desktop-5.24.6-fix-buttongroupmgmt.patch 3830 BLAKE2B b462e016083dbd1eb58b073f72b76536480742003b539ce5afbddd06c8b3b468fc98af05794cb0d624766059b917f60e6371844656816b29ec438876a3537fbf SHA512 2132451ee4d3a05ef847e106b5920f82589e9ee041fc88df4db10f5fce9e00a4961817e3e7f113e5ab410202e0861c1e0ddb6d631b654a2eb44d9d2197dbf679
+AUX plasma-desktop-5.24.6-fix-mouse-settings-loading.patch 1637 BLAKE2B 7dbd5ef28a1f77540029788f08826eb107b4b9d1de8e4ff620900304c17b7a7afe30c899cbce0e9baafff8b8ebfdd717e668ea9305570d70dc8e3ed2a836875e SHA512 e6c606bea1ccad7e7116bda4309585621ac16955a48dee7fa7a778d6523db81f90d94342a003f65be78a04feefd193ad091cc98813165f3d000bee48daf6b43c
 DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.24.6-r1.ebuild 5212 BLAKE2B 9e3292213d22aa001054312f084233ddb6219eaa97f5f52c01e274dcb51acf35d04512fcf3dfd58130a479bdd3d5cd19aadb810b384998aff36129de2b0fb663 SHA512 ca15c914bd7285044dca71c22bed509c2fb834f75d945d8b34b7d8c30004e493bf7557519d7304a2bfdcc72b90aa785af9c45a3bcad3d25dd4f1c07e2b08e8ca
+EBUILD plasma-desktop-5.24.6-r2.ebuild 5348 BLAKE2B 60c60abaad0c55b3cfab40c8b392b9f4a4de3c8fbec5e94a591044229bd9bfe6edbbb9caf7ce8b4c3d2c63505d01e88205af8b432e768bf25289ea9a4ce41f6c SHA512 bc76802bd88ddd6d6ecfab80ee56d944bee48a5e07f57b299ce93cd1d9be5a2a8550f3c4476f5b79b7b02a477f661f45a8f0b9246177815e0061cc2f52710ea1
 EBUILD plasma-desktop-5.25.4.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
new file mode 100644
index 000000000000..0a86d08c5121
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
@@ -0,0 +1,108 @@
+From fffa899345df967ed815104cf88de8466d97b374 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 9 Jul 2022 21:45:37 +0300
+Subject: [PATCH] [applets/pager] Fix button group management on configuration
+ page
+
+More declarative and centralized approach fixes the case when the "Text
+display:" section may have no radio buttons selected.
+
+Amends c50e4b987dc365d741880794ee6f2924065a87a6.
+
+BUG: 456525
+FIXED-IN: 5.24.7 5.25.4 5.26
+(cherry picked from commit 4d835be8808b6372d69c424a66c3c7a1493cd6c3)
+---
+ .../package/contents/ui/configGeneral.qml     | 48 ++++---------------
+ 1 file changed, 10 insertions(+), 38 deletions(-)
+
+diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml
+index b66620e16..c5404b9e1 100644
+--- a/applets/pager/package/contents/ui/configGeneral.qml
++++ b/applets/pager/package/contents/ui/configGeneral.qml
+@@ -25,39 +25,6 @@ Kirigami.FormLayout {
+     property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked
+     property alias cfg_wrapPage: wrapPage.checked
+ 
+-    onCfg_displayedTextChanged: {
+-        switch (cfg_displayedText) {
+-        case 0:
+-            displayedTextGroup.checkedButton = desktopNumberRadio;
+-            break;
+-        case 1:
+-            displayedTextGroup.checkedButton = desktopNameRadio;
+-            break;
+-        default:
+-        case 2:
+-            displayedTextGroup.checkedButton = noTextRadio;
+-            break;
+-        }
+-    }
+-
+-    onCfg_currentDesktopSelectedChanged: {
+-        switch (cfg_currentDesktopSelected) {
+-        case 0:
+-            currentDesktopSelectedGroup.checkedButton = doesNothingRadio;
+-            break;
+-        case 1:
+-            currentDesktopSelectedGroup.checkedButton = showsDesktopRadio;
+-            break;
+-        default:
+-            break;
+-        }
+-    }
+-
+-    Component.onCompleted: {
+-        cfg_currentDesktopSelectedChanged();
+-        cfg_displayedTextChanged();
+-    }
+-
+     QtControls.ButtonGroup {
+         id: displayedTextGroup
+     }
+@@ -113,19 +80,22 @@ Kirigami.FormLayout {
+ 
+         QtControls.ButtonGroup.group: displayedTextGroup
+         text: i18n("No text")
+-        onCheckedChanged: if (checked) cfg_displayedText = 2;
++        checked: cfg_displayedText === 2
++        onToggled: if (checked) cfg_displayedText = 2;
+     }
+     QtControls.RadioButton {
+         id: desktopNumberRadio
+         QtControls.ButtonGroup.group: displayedTextGroup
+         text: isActivityPager ? i18n("Activity number") : i18n("Desktop number")
+-        onCheckedChanged: if (checked) cfg_displayedText = 0;
++        checked: cfg_displayedText === 0
++        onToggled: if (checked) cfg_displayedText = 0;
+     }
+     QtControls.RadioButton {
+         id: desktopNameRadio
+         QtControls.ButtonGroup.group: displayedTextGroup
+         text: isActivityPager ? i18n("Activity name") : i18n("Desktop name")
+-        onCheckedChanged: if (checked) cfg_displayedText = 1;
++        checked: cfg_displayedText === 1
++        onToggled: if (checked) cfg_displayedText = 1;
+     }
+ 
+ 
+@@ -141,12 +111,14 @@ Kirigami.FormLayout {
+ 
+         QtControls.ButtonGroup.group: currentDesktopSelectedGroup
+         text: i18n("Does nothing")
+-        onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0;
++        checked: cfg_currentDesktopSelected === 0
++        onToggled: if (checked) cfg_currentDesktopSelected = 0;
+     }
+     QtControls.RadioButton {
+         id: showsDesktopRadio
+         QtControls.ButtonGroup.group: currentDesktopSelectedGroup
+         text: i18n("Shows the desktop")
+-        onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1;
++        checked: cfg_currentDesktopSelected === 1
++        onToggled: if (checked) cfg_currentDesktopSelected = 1;
+     }
+ }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
new file mode 100644
index 000000000000..69996e532e10
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
@@ -0,0 +1,44 @@
+From 0351cdfc9210f6f88863419534250ab7b8ce04ed Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Mon, 25 Jul 2022 20:06:12 +0300
+Subject: [PATCH] Fix mouse settings not being loaded when a mouse is connected
+
+Keyboard daemon was calling into the wrong module name. There are only
+so much kcminit modules, and all of them are required to be named and
+referenced with a "kcm_" prefix.
+
+Postmortem:
+
+- Mouse settings' saving and loading worked fine.
+- Changing settings on the fly worked fine, and if they were not loaded
+  before due to this bug, KCM loaded them and applied, after which
+  mouse worked fine until disconnected.
+- Starting computer with mouse already connected worked fine.
+- Plug&Play (i.e. connecting mouse after session has started) was the
+  only thing that was broken, because this reconfiguration failed to
+  launch the proper mouse module.
+
+Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk>
+BUG: 435113
+FIXED-IN: 5.24.7, 5.25.4, 5.26
+(cherry picked from commit 0d7eccfbba7c3656487396dd381fcee0717bb1ec)
+---
+ kcms/keyboard/keyboard_daemon.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp
+index ae44b0ef2..56a93c4aa 100644
+--- a/kcms/keyboard/keyboard_daemon.cpp
++++ b/kcms/keyboard/keyboard_daemon.cpp
+@@ -89,7 +89,7 @@ void KeyboardDaemon::configureKeyboard()
+ void KeyboardDaemon::configureMouse()
+ {
+     QStringList modules;
+-    modules << QStringLiteral("mouse");
++    modules << QStringLiteral("kcm_mouse");
+     QProcess::startDetached(QStringLiteral("kcminit"), modules);
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
new file mode 100644
index 000000000000..7c43685d3136
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-2"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
+
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/user-manager
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	kaccounts? ( net-libs/signon-oauth2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-fix-buttongroupmgmt.patch" # KDE-bug 456525
+	"${FILESDIR}/${P}-fix-mouse-settings-loading.patch" # KDE-bug 435113
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}