4 files changed, 2 insertions, 73 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3a5eac0afcf0..4319735bc70e 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,12 +1,11 @@
 AUX qtwayland-5.15.10-Destroy-frame-queue-before-display.patch 1607 BLAKE2B 4a408f62d1b330b9f3c404d17b7771c24015bdba3dd02386446652d30e6038db6e0b77aeeaeb32537a0afe10b2e7a2a2a69a9a8e7efe3b1ff03c72eb6fd85427 SHA512 39bbdf0b9e501e8b101af5f29783eb4432e7dcad97362efce1b97b95bd70334bbc5e4fb707a4fe350a4e04d8dbb520faba77a283eaf8ccf331af40c8f65ba7e9
 AUX qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch 2406 BLAKE2B 523c1a932b46c0dccef224a4ecb11e147e32bc6655373d09fa7c3f7d0ca76fbb69284ce764462d8c4261d13acdf6ef65e5a05fac6cf75c23e264ed66ac42d9e1 SHA512 18366b5ede089581a2c1b1a87dd4d5ce3eb5a29606cb36cd9eefe7a4ee2861dfe87fcb75c44d6237b35e87a3c8106f6e78a34244230e0e20f9a808509daa6e86
-AUX qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch 2364 BLAKE2B 5c623371a016a4e2fa30fe9f9579e3a6ee754330c1528d43b154de08ef0a49888b49347eac449b73e916c670dc1b54bf07693697f123bacc6441cf21f59fa4c9 SHA512 57caa645cffffe559c9ea61320e88929b9697817edae34b91331f68fb69ce51d98e05f5787fc5f29dd568213b0c374dcea1af8a1911be57265679590be21bdbc
 AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE2B 63b053f96f4added309a96d33caea1f361087511cb82249864b4a9971794739903e4df1c240c0a42f71295bb0b4f0f48338e6fcadfe9549372d2b581cb2464b6 SHA512 9be539b99cba04e3009a4a61eb5890708f8cafb09161e2d11868bb3a687591d6d4758a13c469ca22b89380cf1a1950d844c25212ead7b64f45ac275db464a051
 DIST qtwayland-5.15.10-gentoo-kde-1.tar.xz 42480 BLAKE2B 3902ecb713b8f35922b0d19bef0b2ec340ca52feb4b61de629dfa6b344d7f550de3e509e265f4476eb907f78b55d5c50c21d9dfeeb7e2e8f680a43fffc911ed4 SHA512 6a131ca2db008a2d224ee6733f47d05a455a8487d38b45cf63882e98e2c29d8163ac5d2f2c2e043f03103bada6e212b5d33cbf11677f8ca2b86fdbf02fc2b239
 DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08931eaaaf8d53b1db0012c7d0a592c78ae78da56ffc8a1ba9bbac0577a78d4c05a92a22acef51a6afc95db54bea2d1a2a9658b67c4 SHA512 e0131bb1f2a09597a85d1d8a402bcb1d529cbc44f62e9be8dd8eba9c10007ca4f83572ca48052529b2325cdd8d886abed1f96ba4e00768e4b1c2febe1eb5ef91
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
-EBUILD qtwayland-5.15.10-r1.ebuild 1414 BLAKE2B 90162d26eccdf63926cfd4bfce884e4cf43a10c8e3464e3f2d89bf50f831e77269508a7e33205a28337c230d2f9db611d587b9d2e88c0d49e954ad8eb814a965 SHA512 ef9ff3968554384e4f5d4a8ec92dd8efa0ff1464007fa308d2b34b8a3987e70383b56acf3e4cba659727045abf0fb8bfe1461b6dec4f15a1b53b592c25c2bedf
-EBUILD qtwayland-5.15.10-r2.ebuild 1426 BLAKE2B 99f1a590bb16a016785c3798f57fa95fa9db5f6a66907503fec7b413d0c20154ee93121c8e205b04e41532739a9ca70fef6eea10e4ead42dc3252ecca5c86291 SHA512 5c5e00d8a0c741ce2ac46ac377e7b6c8c40c29b4951036c5df987db2729b90e0c52948a693f3e5f0c07f88ed0cb1014ab5142aad2c2e67168593eb5904c80bf6
+EBUILD qtwayland-5.15.10-r3.ebuild 1345 BLAKE2B 16a6cfcd0d43cce18ceeb1b8dfb161e553136dc38712bcd94068dad50acb7ad2f5e2f710e0f0b39f5a44e47df67bf854d8cae26f41442e4f68d80fa0ed0ffbfb SHA512 5b3f5fc391892466f324bc16d1a617abc4b8e60ff26fe0b4316f72a61b747541953944b9e1fc5193b7693148bf55d73a132d893b3ce21828e3e3c6fddaa6a171
+EBUILD qtwayland-5.15.10-r4.ebuild 1357 BLAKE2B bed6276bda779f0155f9f01879ab26357de44410b8c276f40100750c106eaa77d417ab6af3f8a7fc17df644d6e4c9f3c87cd9ecadc9c3ad44586919ad20ef4f9 SHA512 77845fe0b2f430016314e90309d5e3cfd1c3f1469152146f31b632b47c1a366e4cc7caa2dd193ff01668505a0083765db4b7db78fb428e1f367f3211fc2faf2a
 EBUILD qtwayland-6.5.2.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch b/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch
deleted file mode 100644
index 1e949fc32355..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 90995b07d2d4dbd12b7e527a881bf9d6158e277b Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Sun, 19 Mar 2023 10:24:59 +0400
-Subject: [PATCH] Client: Send release button event on pointer leave
-
-Fixes: QTBUG-97037
-Pick-to: 6.6 6.5 6.2 5.15
-Change-Id: I151239b276ab5aefe166f5615baf43dab428ce0c
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-(cherry picked from commit 8235fa65fe033a94e7a44322d3502f25940092ec)
----
- src/client/qwaylandinputdevice.cpp | 9 +++++++--
- src/client/qwaylandinputdevice_p.h | 1 +
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index bc05583a..e562c7a7 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -688,8 +688,8 @@ public:
- 
- void QWaylandInputDevice::Pointer::pointer_leave(uint32_t time, struct wl_surface *surface)
- {
-+    releaseButtons();
-     invalidateFocus();
--    mButtons = Qt::NoButton;
- 
-     mParent->mTime = time;
- 
-@@ -804,6 +804,8 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time
-     default: return; // invalid button number (as far as Qt is concerned)
-     }
- 
-+    mLastButton = qt_button;
-+
-     if (state)
-         mButtons |= qt_button;
-     else
-@@ -842,10 +844,13 @@ void QWaylandInputDevice::Pointer::invalidateFocus()
- 
- void QWaylandInputDevice::Pointer::releaseButtons()
- {
-+    if (mButtons == Qt::NoButton)
-+        return;
-+
-     mButtons = Qt::NoButton;
- 
-     if (auto *window = focusWindow()) {
--        ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers());
-+        ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mLastButton, mParent->modifiers());
-         window->handleMouse(mParent, e);
-     }
- }
-diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
-index 5795f138..bafe3db2 100644
---- a/src/client/qwaylandinputdevice_p.h
-+++ b/src/client/qwaylandinputdevice_p.h
-@@ -346,6 +346,7 @@ public:
-     QPointF mSurfacePos;
-     QPointF mGlobalPos;
-     Qt::MouseButtons mButtons = Qt::NoButton;
-+    Qt::MouseButton mLastButton = Qt::NoButton;
- #if QT_CONFIG(cursor)
-     wl_buffer *mCursorBuffer = nullptr;
-     Qt::CursorShape mCursorShape = Qt::BitmapCursor;
--- 
-2.41.0
-
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
index d724c80f99ba..cab77b1950fc 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
@@ -35,7 +35,6 @@ PATCHES=(
 	# QTBUG-97037, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
 	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	"${FILESDIR}/${P}-send-release-button-event-on-pointer-leave.patch"
 	# bug #910315, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/73
 	"${FILESDIR}/${P}-Destroy-frame-queue-before-display.patch"
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r2.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
index 7e7e512c763a..42e95c1c6c20 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
@@ -35,7 +35,6 @@ PATCHES=(
 	# QTBUG-97037, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
 	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	"${FILESDIR}/${P}-send-release-button-event-on-pointer-leave.patch"
 	# QTBUG-95434, pending/approved upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/79
 	"${FILESDIR}/${P}-QTBUG-95434-convert-cursor-bitmap.patch"