gentoo resync : 29.12.2022

5 files changed, 73 insertions, 8 deletions

diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 768cb09f7121..058067961361 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,7 @@
-DIST systemsettings-5.24.4.tar.xz 205488 BLAKE2B 0bef1c8f3c1c63820b273e8182db3a506b71f379bbe952b485c73485b9fecfea418dea19c1fdfa53fb0fc5436ece192f1b30e60ebb9e3e65151a21f62b9a50bb SHA512 4de5b7c8224f0fb376dfa5481c4185d44632485569e3dd1a7f36582751ca15de2382cd8293d684bdb1d771983ad09b53fa36fe7ae776f447ca09f609a6ec13c0
+AUX systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch 843 BLAKE2B 38a18ca89336b9a4abc3af3c466762095c4c28ca7e6711232546a7b7a16cb0163f77bc4872971483c429a836e40ed34cbbf42b052cd9ab840a5b2b4ad7da5d18 SHA512 944b2695a18c88fee6b77ffbd597cd1fbc9a2283d4f448bee927dfe2c660a58e511abd91928686725ffb6809bfcbf2bb9d8f7358c3f1d357dffe2c384c8e2d85
+AUX systemsettings-5.24.5-fix-kcm-highlighting.patch 1253 BLAKE2B b62c3c1927f09b267d7368faf3d2aae5a0101a628c6e1b11aaa4f1ece0a13ba306ba52cec228833b8ec4cb5929b4f936ffece8df9ba90960834fd7afa4452355 SHA512 44d21933fe20e280fb6f89b9515d7ed8701dbd078a11b3e93bf97a594ffbfc485699b3ff16d78c7ae5225f6f9f36aacfaf94b22ae1b9cf74c0eb9b5d590783e7
 DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
-EBUILD systemsettings-5.24.4.ebuild 1754 BLAKE2B 5ecd7efeb773e3ab6fc762f074e805c1fff1d7c4d7339fde273dab3a8825f2a259aaa28f384a04791d03a96ebf9fa98748d890282ff480b9b788732d1bc21c09 SHA512 fce13b59dcbd64aba9527231caa74bd73101100fb574fdba17424899cfb3695cc179ea9ffe882f326b373e26e59570ee0bb47af65ba4ce160cf1eae7f2646f11
-EBUILD systemsettings-5.24.5.ebuild 1757 BLAKE2B aec19eced8712717173c0c79936bd772012762cdf5ec012b47fc687b942852b447594b41aff65604c16580a2b57f2d5ac36c4b57d0a20d6d658469e24ecaf5c7 SHA512 15f49a5fbbd47d4e678e99ddaccd8dbee17ab8e73f43e6a3210bd9178abe56535e5518eff209018106b085e5531b4e457aa8c96f8d0f59825ec4b60843065c3c
+DIST systemsettings-5.25.2.tar.xz 207588 BLAKE2B 29c41074458ee5f809448bbe6e49a5623672c92a08ddf57448ae44dcaf199ad4a7797171450b48172b3536cf4f1ed95469d5ee355a619fab39e069678281b1d0 SHA512 16f1e7771ca3025193743126492bcebda5b61373f3ad434efa506ba540d1dd6d5681fc72c89c1a1829f5661831617ed6c9cdf2847dcc34df8d32d218ed99d36e
+EBUILD systemsettings-5.24.5-r1.ebuild 1900 BLAKE2B 2602d0578a1c3a2ca774c6fc8c589df82b7c90de7154e40866cce60ff75d85f23442c5ac2fb4c38bde0b2c32d16249de1f3664a05a3cbbf939a054dccf1eb34a SHA512 14eb6addb666372fccf5b1e03a5983f79e26f6c687ff2525fc776575abcd2767eed5527ac2edd3f6c22897a5436a2a77d122b2607b7401e20c22fcbc7998527c
+EBUILD systemsettings-5.25.2.ebuild 1722 BLAKE2B 024fe86b1a256f532b97c51e2b25adeaddf0995e1a2200e392fe4f62ba2702f693b7b36022bdff8ded0b2a0b9de3e7bc484b7f240b0739befda22e4648272455 SHA512 7eb9446fc4125e6d82f6f56c55b15fb3fd8bce88cbf603a934618390ee2397d5b8a133b454e9cd1ccbcbeeb7ae4e31196bb9e9487824951200b4730fff78de69
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
new file mode 100644
index 000000000000..c52f043133b7
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
@@ -0,0 +1,27 @@
+From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 16:49:55 +0200
+Subject: [PATCH] Fix activating running instance on Wayland
+
+(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3)
+---
+ app/main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 13a803cd..e3f7b004 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -172,7 +172,8 @@ int main(int argc, char *argv[])
+             mainWindow->reloadStartupModule();
+         }
+ 
+-        KWindowSystem::forceActiveWindow(mainWindow->winId());
++        KWindowSystem::updateStartupId(mainWindow->windowHandle());
++        KWindowSystem::activateWindow(mainWindow->windowHandle());
+     });
+ 
+     if (!startupModule.isEmpty()) {
+-- 
+GitLab
+
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
new file mode 100644
index 000000000000..9f8d494ded69
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
@@ -0,0 +1,32 @@
+From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 01:22:14 +0200
+Subject: [PATCH] Fix current index in subcategory list
+
+We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken
+
+Manually set the current index when the backend index changes
+
+BUG: 453543
+
+Fixed-In: 5.24.6
+(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a)
+---
+ sidebar/package/contents/ui/SubCategoryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml
+index 756b2763..19b33142 100644
+--- a/sidebar/package/contents/ui/SubCategoryPage.qml
++++ b/sidebar/package/contents/ui/SubCategoryPage.qml
+@@ -140,6 +140,7 @@ Kirigami.ScrollablePage {
+         Connections {
+             target: systemsettings
+             function onActiveSubCategoryRowChanged() {
++                subCategoryView.currentIndex = systemsettings.activeSubCategoryRow
+                 if (systemsettings.activeSubCategoryRow >= 0) {
+                     if (subCategoryView.count > 1) {
+                         root.pageStack.push(subCategoryColumn);
+-- 
+GitLab
+
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
index 1fd3657ca980..3fd54a2ee7bc 100644
--- a/kde-plasma/systemsettings/systemsettings-5.24.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
@@ -52,6 +52,11 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543
+	"${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch"
+)
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild
index 3b2ece11ba78..9c2c438cbbef 100644
--- a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.90.0
+KFMIN=5.94.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5