gentoo auto-resync : 26:02:2025 - 19:26:07

3 files changed, 2 insertions, 95 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 5b1f80134d78..70eeb1302702 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,5 @@
-AUX kwin-6.3.1-gcc15-workaround.patch 4151 BLAKE2B 8c013bfc27eac43982eb63353e233a3083fd55e59af2c36fe3356a106be2fbff664cfa2c4b6c8720db49e0d8aa1b1bf36bf7409c552a164acb3580cf3ec7a68f SHA512 c6c7b485c0fb1bc1342b22e12f0ed6ce0a1fe481537797d2f76c509e507b75912352f32cbc75bba97a1b24261301aa325b77f05019aa1f7efe96679c126ef65e
 DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b
-DIST kwin-6.3.2.tar.xz 8868688 BLAKE2B 6e96edcf69895998e39dc37db417cc192aaef9b37ee7419687bfbfaaaa12b26701345abf4d7c16c4bfb4d61624e094268eb6a575e3d6ffcc29d631aea58540e0 SHA512 6d3510b5d9198239660dc27c3ea3de6c53d7b414945f335175b5327e78540b7a17023e3883c3f3b8ed4b91b6dca236eaaf2bd0c0bcd0cc59da620ba74e5ee3a5
+DIST kwin-6.3.2.1.tar.xz 8869196 BLAKE2B 2f1578278c8c977cbd6e1f149e6bd83290779242a1cddad8596e8a7f71f5a439ea65f681772aff0dcd47c6d2283a50c5474f82f0bab606c31bd072b75de8f698 SHA512 551e3860babe05d69f267075fa4cd99b4ce8864717b62f99e09febc63df500c7d355e2f4d59d911e833023e43eb85f9c0fd02190622c26f5361d2b7bdb785894
 EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285
-EBUILD kwin-6.3.2.ebuild 4468 BLAKE2B 77ee10c8d0900f1dbbd6eccd15f9543a5d2989c35872fc5409df7414b4c0289386d99b1f8f2d50e4e8b28b0fb71efff48fba8243ba40b606a13d830e95a6c261 SHA512 cdb79fe87a8f45d5e790e50670e6f4f9ddc1b697a34aad12da5ca35b1ac82c05c1119d09a910327fa9ef7ee783d876e8ea827c140bb000b82b66562ac8e9f3b4
+EBUILD kwin-6.3.2.1.ebuild 4468 BLAKE2B 77ee10c8d0900f1dbbd6eccd15f9543a5d2989c35872fc5409df7414b4c0289386d99b1f8f2d50e4e8b28b0fb71efff48fba8243ba40b606a13d830e95a6c261 SHA512 cdb79fe87a8f45d5e790e50670e6f4f9ddc1b697a34aad12da5ca35b1ac82c05c1119d09a910327fa9ef7ee783d876e8ea827c140bb000b82b66562ac8e9f3b4
 MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.3.1-gcc15-workaround.patch b/kde-plasma/kwin/files/kwin-6.3.1-gcc15-workaround.patch
deleted file mode 100644
index 3990682a5f9d..000000000000
--- a/kde-plasma/kwin/files/kwin-6.3.1-gcc15-workaround.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-https://invent.kde.org/plasma/kwin/-/merge_requests/7191
-https://bugs.kde.org/show_bug.cgi?id=500310
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118923
-
-From 4d9a024f1b2f502de9a33024a2a762aefa4007cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
- <kacper.slominski72@gmail.com>
-Date: Tue, 18 Feb 2025 18:16:59 +0100
-Subject: [PATCH] Factor out {previousRestricted,restricted}MoveArea calls out
- of loops
-
-This works around a GCC 15 bug that causes KWin to crash.
-
-BUG: 500310
----
- src/window.cpp | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/src/window.cpp b/src/window.cpp
-index a05771e90c..1a56560280 100644
---- a/src/window.cpp
-+++ b/src/window.cpp
-@@ -4026,25 +4026,29 @@ void Window::checkWorkspacePosition(QRectF oldGeometry, const VirtualDesktop *ol
-     auto moveAreaFunc = workspace()->inRearrange() ? &Workspace::previousRestrictedMoveArea : //... the restricted areas changed
-         &Workspace::restrictedMoveArea; //... when e.g. active desktop or screen changes
- 
--    for (const QRect &r : (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaTop)) {
-+    const auto oldRectsTop = (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaTop);
-+    for (const QRect &r : oldRectsTop) {
-         QRect rect = r & oldGeomTall;
-         if (!rect.isEmpty()) {
-             oldTopMax = std::max(oldTopMax, rect.y() + rect.height());
-         }
-     }
--    for (const QRect &r : (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaRight)) {
-+    const auto oldRectsRight = (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaRight);
-+    for (const QRect &r : oldRectsRight) {
-         QRect rect = r & oldGeomWide;
-         if (!rect.isEmpty()) {
-             oldRightMax = std::min(oldRightMax, rect.x());
-         }
-     }
--    for (const QRect &r : (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaBottom)) {
-+    const auto oldRectsBottom = (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaBottom);
-+    for (const QRect &r : oldRectsBottom) {
-         QRect rect = r & oldGeomTall;
-         if (!rect.isEmpty()) {
-             oldBottomMax = std::min(oldBottomMax, rect.y());
-         }
-     }
--    for (const QRect &r : (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaLeft)) {
-+    const auto oldRectsLeft = (workspace()->*moveAreaFunc)(oldDesktop, StrutAreaLeft);
-+    for (const QRect &r : oldRectsLeft) {
-         QRect rect = r & oldGeomWide;
-         if (!rect.isEmpty()) {
-             oldLeftMax = std::max(oldLeftMax, rect.x() + rect.width());
-@@ -4052,25 +4056,29 @@ void Window::checkWorkspacePosition(QRectF oldGeometry, const VirtualDesktop *ol
-     }
- 
-     // These 4 compute new bounds
--    for (const QRect &r : workspace()->restrictedMoveArea(desktop, StrutAreaTop)) {
-+    const auto newRectsTop = workspace()->restrictedMoveArea(desktop, StrutAreaTop);
-+    for (const QRect &r : newRectsTop) {
-         QRect rect = r & newGeomTall;
-         if (!rect.isEmpty()) {
-             topMax = std::max(topMax, rect.y() + rect.height());
-         }
-     }
--    for (const QRect &r : workspace()->restrictedMoveArea(desktop, StrutAreaRight)) {
-+    const auto newRectsRight = workspace()->restrictedMoveArea(desktop, StrutAreaRight);
-+    for (const QRect &r : newRectsRight) {
-         QRect rect = r & newGeomWide;
-         if (!rect.isEmpty()) {
-             rightMax = std::min(rightMax, rect.x());
-         }
-     }
--    for (const QRect &r : workspace()->restrictedMoveArea(desktop, StrutAreaBottom)) {
-+    const auto newRectsBottom = workspace()->restrictedMoveArea(desktop, StrutAreaBottom);
-+    for (const QRect &r : newRectsBottom) {
-         QRect rect = r & newGeomTall;
-         if (!rect.isEmpty()) {
-             bottomMax = std::min(bottomMax, rect.y());
-         }
-     }
--    for (const QRect &r : workspace()->restrictedMoveArea(desktop, StrutAreaLeft)) {
-+    const auto newRectsLeft = workspace()->restrictedMoveArea(desktop, StrutAreaLeft);
-+    for (const QRect &r : newRectsLeft) {
-         QRect rect = r & newGeomWide;
-         if (!rect.isEmpty()) {
-             leftMax = std::max(leftMax, rect.x() + rect.width());
--- 
-GitLab
diff --git a/kde-plasma/kwin/kwin-6.3.2.ebuild b/kde-plasma/kwin/kwin-6.3.2.1.ebuild
index ad356a50bab6..ad356a50bab6 100644
--- a/kde-plasma/kwin/kwin-6.3.2.ebuild
+++ b/kde-plasma/kwin/kwin-6.3.2.1.ebuild