gentoo resync : 29.12.2022

4 files changed, 7 insertions, 141 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index ed59724e3b2d..004d28514019 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,6 @@
-AUX plasma-desktop-5.24.4-folderview-icons-per-resolution.patch 4738 BLAKE2B 115a79699c3508224a7c7cd4e8156ae8303a30f7d830e5a01b8ce3acba31778ec06818a6b338611172a5a6c76d57694d29e6baf673de24d197b7b65c4037519a SHA512 95e1234f6ccd170082705f7a71e7aad95136849e45ed36949cbfc0ddbaaa4433bad96abfe1fc4a9544d9be9105cbcebb197ba57e2aea3f081ccea0d7185a1b4a
-DIST plasma-desktop-5.24.4.tar.xz 6239980 BLAKE2B 0b8af5d596e277d202a9c088aa561ce3f0c3602ca781c807b4082f37da4269176429946edf0665ebd9bc6046cd6b0a97baf5a67ec3c0194c23d6fe237a56c18d SHA512 9d6a8c50a85d7f59b89a13753d9a7072df5e8bd1e726bf1037c4cf8d4d43046c2076c8993dffc1f5cec7f7a113832dd14f836e9b47b879f6352f3c30f4b5c408
 DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
+DIST plasma-desktop-5.25.2.tar.xz 6279760 BLAKE2B bc17e6dd7f472b1d07802015e20c4a727042179f45be29b2eff9da22e9b81a821d12a3398ef3f5b1dc9228f767112501911b72e6ef65d3a3d4d750949ce44172 SHA512 3459dec46338453f4fc4271753c44a91cf1924eb0eab26d64ebab5bd3070ed1ce5c18154dfae4b20f496ffa492cb3e329958c1f628f1871bac89cc30d049fde4
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.24.4-r1.ebuild 5268 BLAKE2B 0345d026a9a0198c3e914420ebdf127c427ded81dde62edb1de8a0e7375dd90cd339962fbc25f17013fe1a2bc83b7e7236c92838e93e00ed1494c278681fbcd0 SHA512 e74cfa92e9d93f01cb15050fc7933dd9eaf0700032d06a3056ff86b49f3aca7c6d9be309644ef8d3a7af183d2a79a5d276c4298c70b065663481600282f8b454
-EBUILD plasma-desktop-5.24.5.ebuild 5188 BLAKE2B 9edcb388467c24bef79ec2d7529d0d4b7572c4d0d00e3680ab171372d0ae40dd874db98dad23f3a4b270436c4ffe46b1518abc2a0e2b516403d3ea07b4b1bf71 SHA512 c42dcbc58beb412604860918369287caef1a5aa0551de3602f65866ae42ba94a3f5ac92b4d7c4255791c1745075216e1f2c898d887e929a2d08122a76098803d
+EBUILD plasma-desktop-5.24.5.ebuild 5185 BLAKE2B 1cbc7280829c1b8f7de67dae950d14cf0eda465d255e952f1121bc8fd5116d44bfdc2e5849079346152a6c8fbfc3988ea785df0844b5d02bdf86aa9615e83e7d SHA512 e323a68fde0cfef29cdfc5b6cc8a64f7a8bca9ca224b895ead0eb620ae1c163b292717df0ba3359cb84fb77dfc5316f520bd43aa4013b31cafdb5caec8f884b3
+EBUILD plasma-desktop-5.25.2.ebuild 5195 BLAKE2B 309555cafe16f3623d6467ddd2cf4cae8b25fc2b06713e7a63d762269fc8f1c647077136579b161ec6c1cd181222b72d7d4fdb55bdd828549ec4d600fd624e7d SHA512 38e357cdb8fd3c248044ce8f3ae0cc9b76a0c3e5cb27df246144d5d3c55b77f402f2d9461ee43a8871a6864497eebed8f76fe0e6c4024faa47e35aa672e75610
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
deleted file mode 100644
index fce29f49536a..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001
-From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-Date: Tue, 12 Apr 2022 15:01:15 +0000
-Subject: [PATCH] Folder View: save desktop containment icon positions on a
- per-resolution basis
-
-BUG: 360478
-BUG: 354802
-FIXED-IN: 5.24.5
-(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772)
----
- .../package/contents/ui/FolderView.qml        | 15 +--------
- .../package/contents/ui/FolderViewLayer.qml   | 32 +++++++++++++++++--
- .../desktop/plugins/folder/positioner.cpp     |  1 +
- 3 files changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index 218a3da77..72ae4903a 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -30,6 +30,7 @@ FocusScope {
-     property alias currentIndex: gridView.currentIndex
-     property alias url: dir.url
-     property alias status: dir.status
-+    property alias perStripe: positioner.perStripe
-     property alias positions: positioner.positions
-     property alias errorString: dir.errorString
-     property alias dragging: dir.dragging
-@@ -828,20 +829,6 @@ FocusScope {
-                     }
-                 }
- 
--                onFlowChanged: {
--                    // FIXME TODO: Preserve positions.
--                    if (positioner.enabled) {
--                        positioner.reset();
--                    }
--                }
--
--                onLayoutDirectionChanged: {
--                    // FIXME TODO: Preserve positions.
--                    if (positioner.enabled) {
--                        positioner.reset();
--                    }
--                }
--
-                 onCurrentIndexChanged: {
-                     positionViewAtIndex(currentIndex, GridView.Contain);
-                 }
-diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
-index 3f9b29937..f2044e1b0 100644
---- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
-+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
-@@ -29,6 +29,8 @@ FocusScope {
-     property alias overflowing: folderView.overflowing
-     property alias flow: folderView.flow
- 
-+    property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
-+
-     readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons")
- 
-     focus: true
-@@ -178,6 +180,26 @@ FocusScope {
-         }
-     }
- 
-+    function getPositions() {
-+        try {
-+            var allPositions = JSON.parse(plasmoid.configuration.positions);
-+        } catch (err) {
-+            var allPositions = {};
-+            allPositions[resolution] = plasmoid.configuration.positions;
-+        }
-+        return allPositions[resolution] || "";
-+    }
-+
-+    function savePositions(positions) {
-+        try {
-+            var allPositions = JSON.parse(plasmoid.configuration.positions);
-+        } catch (err) {
-+            var allPositions = {};
-+        }
-+        allPositions[resolution] = positions;
-+        plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort());
-+    }
-+
-     Connections {
-         target: plasmoid.configuration
- 
-@@ -211,7 +233,7 @@ FocusScope {
-         }
- 
-         function onPositionsChanged() {
--            folderView.positions = plasmoid.configuration.positions;
-+            folderView.positions = getPositions();
-         }
-     }
- 
-@@ -241,12 +263,16 @@ FocusScope {
-         }
- 
-         onPositionsChanged: {
--            plasmoid.configuration.positions = folderView.positions;
-+            savePositions(folderView.positions);
-+        }
-+
-+        onPerStripeChanged: {
-+            folderView.positions = getPositions();
-         }
- 
-         Component.onCompleted: {
-             folderView.sortMode = plasmoid.configuration.sortMode;
--            folderView.positions = plasmoid.configuration.positions;
-+            folderView.positions = getPositions();
-         }
-     }
- 
-diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
-index 859c16754..3b2df8c5a 100644
---- a/containments/desktop/plugins/folder/positioner.cpp
-+++ b/containments/desktop/plugins/folder/positioner.cpp
-@@ -854,6 +854,7 @@ void Positioner::applyPositions()
-         }
- 
-         if (pos > m_perStripe) {
-+            qDebug() << "Some items did not fit, rearranging";
-             name = positions.at(offset);
- 
-             if (!sourceIndices.contains(name)) {
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index 302d9b8d656b..ae1f627cb572 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild
index 5fedd708f1d5..1dffe8ec99b9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.90.0
+KFMIN=5.94.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
@@ -120,7 +120,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478
 )
 
 src_prepare() {