gentoo resync : 31.05.2021

3 files changed, 54 insertions, 1 deletions

diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index b1a9354676b4..a2e62d815d68 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,6 @@
+AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a64671ecd4687dc61048829b129d15c302b16c30a79d97c2896f1b84c7fa7e2dc26d486742b3cbfbb9e8b42166b92586baf6efef3a3e SHA512 6e2eb41d9c44acca58d2e4c2a93c3fd73e808bc6eccafeae8278351b9a780a0f75d8ee80343fb55cee0880fd4081537223caf430ed2093edb8b59f1b27f84fee
 DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
 DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
 EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba
-EBUILD breeze-5.21.5.ebuild 1268 BLAKE2B 3a861b41bf751ba791c81a5e4fc5b92fcf9b8cb6bc85973331cf622cb537c61a64e0f5e88b7c72c135e8c865b8af4224f8f39542ebdf6e1d521ad8ae51adf437 SHA512 0bb2d875223c501579fad443bdcbed1dee09c48eb5b0c7d63f9f03a8d04a64c48dce5a41e5d32ab1db9cb3ad210604c37501ece5c193b2160a8d1e9c8c3473bd
+EBUILD breeze-5.21.5-r1.ebuild 1325 BLAKE2B 31bb7f89fd40b7afb9a495b49ab29a423ae124e2bba390eb9ab2cf5372de6d850faa1559c8c8f214e55402458e861e89ed49e116feeba57449a9b71817747328 SHA512 120bf11e9d6a707f523c73e13bacad3f3bf6d1502a766ba5c1093a0278365360b25981568b9a709a3ea836103f9a16943dd6d246583d7dbad081b64b68f378a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.21.5.ebuild b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
index d1a274a975e7..c87f6e948b99 100644
--- a/kde-plasma/breeze/breeze-5.21.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
@@ -43,6 +43,8 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-splitter-proxy.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X XCB)
diff --git a/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch b/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch
new file mode 100644
index 000000000000..52646721a4b8
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch
@@ -0,0 +1,50 @@
+From f99b7ef621c9c69544158d245699fd8104db6753 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sat, 15 May 2021 17:45:54 +0200
+Subject: [PATCH] Fix informing the underlying widget when leaving
+ SplitterProxy
+
+While the SplitterProxy is active, it intercepts all relevant events, so that
+the underlying widget still thinks it's in the same "on splitter" state. When
+the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove
+event to make it aware of the new current cursor position. Without this, it
+doesn't know that it's not supposed to be in the "on splitter" state, and when
+it regains focus it just re-activates the SplitterProxy at the current cursor
+position.
+
+This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing
+when above another QSplitterHandle"), which moved the hide() call past the
+call to QCoreApplication::sendEvent. Previously that made isVisible() false,
+which also prevented the interception of the HoverLeave/HoverMove events.
+
+BUG: 436473
+---
+ kstyle/breezesplitterproxy.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp
+index 0cf5685f..d4db407b 100644
+--- a/kstyle/breezesplitterproxy.cpp
++++ b/kstyle/breezesplitterproxy.cpp
+@@ -341,11 +341,14 @@ namespace Breeze
+         // send hover event
+         if( _splitter )
+         {
+-            QHoverEvent hoverEvent(
+-                qobject_cast<QSplitterHandle*>(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
+-                _splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
+-            QCoreApplication::sendEvent( _splitter.data(), &hoverEvent );
++            // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter,
++            // but this is meant to reach it directly. Unset _splitter to stop interception.
++            auto splitter = _splitter;
+             _splitter.clear();
++            QHoverEvent hoverEvent(
++                qobject_cast<QSplitterHandle*>(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
++                splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
++            QCoreApplication::sendEvent( splitter.data(), &hoverEvent );
+         }
+ 
+         // kill timer if any
+-- 
+GitLab
+