gentoo auto-resync : 12:05:2023 - 23:49:59

4 files changed, 55 insertions, 2 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 76187041d40f..b707906ca547 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 3875cdad6507..1be6f7dbe0b0 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,9 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
 AUX kwin-5.27.5-fix-xcbutils-nativeFloor.patch 931 BLAKE2B 301b2db3db66ded11986583810d8283bf30ed7f6b848db0232e7c91b1c7cb660eacc8f631ff31ed41df826be7d48443235dba7a125b955af968e872a7e903e32 SHA512 baf12c4f2b8a1804fc268ab3a05ff6d207b9cdb07be2faf4327ce53fd0d68f2dc032d92ef11d95cf23f1c9eed3499552c48c3034836b940fc71d1e563e2a2466
+AUX kwin-5.27.5-revert-7c91c4ba.patch 2151 BLAKE2B e00b120fdd86104997b8ad8d4dbedb90c1208926e7623468cc137975124b049594467d08159f9ef130729a3221c6016498badac3f1ddcfcdcfca905ea323fbdf SHA512 3be6617d6bedcf027f2c2087a29b4e052798835846d380feab0f96f14226f088e2d175a416d50a149ed17f1a600b4b04596f7738191d4bb79bd54be26b7848c2
 DIST kwin-5.27.4.1-patchset-1.tar.xz 8736 BLAKE2B 26fa987b087c9f7687cb30b4c3d66d1d3cdac855bfa0c59af10429b67f9a75c7f2a9cf76ee0a0125afc31b70097cdc25fcd3a482496cf6fb2dae4c929695098e SHA512 2c2bc1756064f4c772172aad58533412b7ac534d25c1a81bb4b65671a2ce9747e9dbd201826bd0e79d2eb31b8df9473a1dcee7f284f7eb352844c0c8f5ed9049
 DIST kwin-5.27.4.1.tar.xz 7621340 BLAKE2B 53f8001542f03be032fcf09d214e5e1d8be56bfcb506c5440aba7ea2b37515770b4c865e10d11a76722ee0fe2a8376c7a07311ff44d5adacca0c5969425f5cc3 SHA512 b686fce07d48b52f987e459ff42dd29da3cbd80beea1f4f1a7cb52f49a6cce9ad167e549ac876697bc820d158fd7fdbaa39fb1261b3573cb374e058ea09e1bbf
 DIST kwin-5.27.5.tar.xz 7622688 BLAKE2B 267cd1515f2667a4b96f0ffccbced0885c602d4a5227127ba5c9a23ccd9483d5f613fbc40d39e58ca16c42103f0caf09d39b4e5387d2673bd22393519e142e8f SHA512 777bf193ad8e4440ee9866f6b725e191460c5ff4b33e3e517184568fda3aee4936be5274daa33996ae654465b477b108fee83f91e33f0db8f622de7629340de8
 EBUILD kwin-5.27.4.1-r1.ebuild 4402 BLAKE2B 4479c92ad0a612de319ea40c1fec88df3e1a74cbb1aaad844d8db00452c2d76037ca8ad13d41b357bec55dc7d045d55ea72e7657d993843f5e494142ffb01df9 SHA512 584f24c31a2c0fcf82f40eb1281d79471755927fe225dc6674a9600867ea28fb75f6baf8eecebd0362efcf2795a94eeb4aa386f85f9ad27f9caded09a47d3f5a
-EBUILD kwin-5.27.5-r1.ebuild 4302 BLAKE2B e2348bc35229b66a8e62b1279266b85f8465599a9ac94960c520ae7a8135f695480d83d2961b0294b0515ae28d14bbd04dc846606f328387cd00eeca3ab95698 SHA512 b1b0735492d9e73565367852da3ed733ea0ea3dfe80af2089ae300ac8831683bc5bfb2b9da676feeec720e56bbc8afadf5a8a4f98a203f73991079981045cee0
+EBUILD kwin-5.27.5-r2.ebuild 4377 BLAKE2B 1d348fee5f7cf75983b6eb97d3dce87e06c825955f70b32c2011a451686c6e5e6183a3eefcf751f25882da751ade1969c9040afc05944cd65c35d97a001d873c SHA512 e7c22768c7ee6a58a87279f078c8148de81f2969899a1576d158aa9868c556ae5ae6b8d7c84ce4fc3833483be403b606b55cc1826f15e9391c82d3cb2378ef04
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.27.5-revert-7c91c4ba.patch b/kde-plasma/kwin/files/kwin-5.27.5-revert-7c91c4ba.patch
new file mode 100644
index 000000000000..f7c2047818b3
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.27.5-revert-7c91c4ba.patch
@@ -0,0 +1,49 @@
+From 3d62e7548955e2ddf298c61a55fcd26007ea27bb Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Thu, 11 May 2023 22:56:32 +0300
+Subject: [PATCH] Revert "wayland: Avoid pointer warp if constraint region is
+ invalid"
+
+This reverts commit 7c91c4bad9ee709eebfdf9d5b3997fa00ca7cd13.
+
+It created regressions in some video games. After a closer look at the
+pointer constraint region handling, there are some issues, but it might
+be safer to fix them in master.
+
+In meanwhile, let's revert 7c91c4bad because it breaks more things than
+it fixes.
+
+CCBUG: 457021
+BUG: 469555
+
+
+(cherry picked from commit 07da1796b8388b00275d8281fac476bde71cd02b)
+---
+ src/pointer_input.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp
+index 2b582649a61..d47b5bc47d3 100644
+--- a/src/pointer_input.cpp
++++ b/src/pointer_input.cpp
+@@ -669,7 +669,7 @@ void PointerInputRedirection::updatePointerConstraints()
+                 lock->setLocked(false);
+                 m_locked = false;
+                 disconnectLockedPointerAboutToBeUnboundConnection();
+-                if (!(hint.x() < 0 || hint.y() < 0 || !lock->region().contains(hint.toPoint())) && focus()) {
++                if (!(hint.x() < 0 || hint.y() < 0) && focus()) {
+                     processMotionAbsolute(focus()->mapFromLocal(hint), waylandServer()->seat()->timestamp());
+                 }
+             }
+@@ -684,7 +684,7 @@ void PointerInputRedirection::updatePointerConstraints()
+             // In this case the cached cursor position hint must be fetched before the resource goes away
+             m_lockedPointerAboutToBeUnboundConnection = connect(lock, &KWaylandServer::LockedPointerV1Interface::aboutToBeDestroyed, this, [this, lock]() {
+                 const auto hint = lock->cursorPositionHint();
+-                if (hint.x() < 0 || hint.y() < 0 || !lock->region().contains(hint.toPoint()) || !focus()) {
++                if (hint.x() < 0 || hint.y() < 0 || !focus()) {
+                     return;
+                 }
+                 auto globalHint = focus()->mapFromLocal(hint);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.27.5-r1.ebuild b/kde-plasma/kwin/kwin-5.27.5-r2.ebuild
index 1cb246c16ea3..8b3d63a473fd 100644
--- a/kde-plasma/kwin/kwin-5.27.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.5-r2.ebuild
@@ -103,7 +103,10 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${P}-fix-xcbutils-nativeFloor.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-xcbutils-nativeFloor.patch" #KDE-bug 459373
+	"${FILESDIR}/${P}-revert-7c91c4ba.patch" #KDE-bug 469555
+)
 
 src_prepare() {
 	ecm_src_prepare