gentoo resync : 12.05.2022

6 files changed, 140 insertions, 77 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index c9c460c48df0..ed59724e3b2d 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,7 @@
-AUX plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch 2547 BLAKE2B 1810c8c02cc947c9f302b5669770b858dc3c1c3f555563dd92d9acb04cd26b51f6417c6ff5f6a16e50f934c1824952a7e093e8247574324b3472d67de4dc11e2 SHA512 5fbf21e4536c4a315665179d3c815e829cf45c0a0c544eeb8a514dbe0ddf4b8d0b699a9051c197fe73f4eb7490167d04c6388079912d61d2139648bd2caa79b5
-DIST plasma-desktop-5.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
+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-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.23.5-r1.ebuild 5560 BLAKE2B 62cbbef8fa7071c7b48bcc08c30e178118fab60f820d91f8a18304b6b4db9897674808de2c08a151b4cbaad4c76712d4c5e1cd94428921cf70342a137e018481 SHA512 936fe937dbc3a13fd01e698192a0d99f70800545d030c2fbceaa65298a5d5963210c8b310858b01e64fabddff97121dc9091d2a82b74fb4ba4a7836390d7f2d6
-EBUILD plasma-desktop-5.24.4.ebuild 5188 BLAKE2B 9edcb388467c24bef79ec2d7529d0d4b7572c4d0d00e3680ab171372d0ae40dd874db98dad23f3a4b270436c4ffe46b1518abc2a0e2b516403d3ea07b4b1bf71 SHA512 c42dcbc58beb412604860918369287caef1a5aa0551de3602f65866ae42ba94a3f5ac92b4d7c4255791c1745075216e1f2c898d887e929a2d08122a76098803d
-MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
+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
+MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
deleted file mode 100644
index fb4d0bacbd90..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 346dafd3a0e19805f77147a9515a7333a05ed584 Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Tue, 8 Feb 2022 11:16:16 +0000
-Subject: [PATCH] Add a granular cache preference thing to attica-kde
-
-Commit 798027fd17ab86eea022e5d269aa86138b28b130
-
-This allows us to explicitly add cache preference to specific calls.
-Usually attica calls want to be very current, but in some cases we can
-assume things aren't going to change often (such as the categories
-call), and we can just use the cached version for those calls.
-
-Fix missing variable name
-Commit 8e164050c594855ee3728678d6d0907a10b28db6
-
-Only trust the expiration date if it's less than 24 hours
-Commit b85cf34298c274b5f16cb6c2aead7b87f0dabbb8
-
-Fix build
-Commit 6e8626f2d65a03af3cd12fb5390040c56ca3258d
----
- attica-kde/kdeplugin/kdeplatformdependent.cpp | 20 ++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
-index c2c90107e..850c91284 100644
---- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
-+++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
-@@ -125,6 +125,25 @@ QNetworkRequest KdePlatformDependent::addOAuthToRequest(const QNetworkRequest &r
-         const QString bearer = bearer_format.arg(token);
-         notConstReq.setRawHeader("Authorization", bearer.toUtf8());
-     }
-+
-+    // Add cache preference in a granular fashion (we will almost certainly want more of these, but...)
-+    static const QStringList preferCacheEndpoints{QLatin1String{"/content/categories"}};
-+    for (const QString &endpoint : preferCacheEndpoints) {
-+        if (notConstReq.url().toString().endsWith(endpoint)) {
-+            QNetworkCacheMetaData cacheMeta{m_accessManager->cache()->metaData(notConstReq.url())};
-+            if (cacheMeta.isValid()) {
-+                // If the expiration date is valid, but longer than 24 hours, don't trust that things
-+                // haven't changed and check first, otherwise just use the cached version to relieve
-+                // server strain and reduce network traffic.
-+                const QDateTime tomorrow{QDateTime::currentDateTime().addDays(1)};
-+                if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < tomorrow) {
-+                    notConstReq.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-+                }
-+            }
-+            break;
-+        }
-+    }
-+
-     return notConstReq;
- }
- 
--- 
-2.34.1
-
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
new file mode 100644
index 000000000000..fce29f49536a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
@@ -0,0 +1,132 @@
+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/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 98dd3653422b..3ea9270f30ec 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
-		<flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
index a086617e1a8e..5fedd708f1d5 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -18,7 +18,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"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -95,10 +95,6 @@ COMMON_DEPEND="
 		kde-apps/kaccounts-integration:5
 		net-libs/accounts-qt
 	)
-	policykit? (
-		>=kde-frameworks/kwallet-${KFMIN}:5
-		virtual/libcrypt:=
-	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 	telemetry? ( dev-libs/kuserfeedback:5 )
@@ -119,24 +115,17 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/setxkbmap
 	x11-misc/xdg-user-dirs
 	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
 "
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	# https://mail.kde.org/pipermail/distributions/2022-February/001140.html
-	"${FILESDIR}/${P}-attica-add-granular-cache-pref.patch"
+	"${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478
 )
 
 src_prepare() {
 	ecm_src_prepare
 
-	if ! use policykit; then
-		ecm_punt_kf_module Wallet
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
 	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
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index 302d9b8d656b..302d9b8d656b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild