summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-04-13 23:12:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-04-13 23:44:28 +0200
commit8b3c08bdc3c5e7a2776fae61244190378dd3052e (patch)
tree17427cd003b4ab978073ad4a2aa73f37d2d757bc
parentdev-qt/qtvirtualkeyboard: 5.15.9 version bump (diff)
downloadgentoo-8b3c08bdc3c5e7a2776fae61244190378dd3052e.tar.gz
gentoo-8b3c08bdc3c5e7a2776fae61244190378dd3052e.tar.bz2
gentoo-8b3c08bdc3c5e7a2776fae61244190378dd3052e.zip
dev-qt/qtwayland: 5.15.9 version bump
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtwayland/Manifest2
-rw-r--r--dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch37
-rw-r--r--dev-qt/qtwayland/qtwayland-5.15.9.ebuild51
3 files changed, 90 insertions, 0 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 4557bf9b1e2e..d0d8c4a259ea 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,3 +1,5 @@
DIST qtwayland-5.15.8-gentoo-kde-3.tar.xz 47636 BLAKE2B b57cef6d4ce70747b74062e26459e4957c8df2c1c588b00580e175982b09c8cf172968d4d0bc95576e0e76f2640188d3beef4986d33ef4b79d209bf4a4cdbb45 SHA512 bd23c644f6e957ce7c0aacbe08112deb992608f5546889f765b333fc6094e34bc7329859d66bfbdbd56ebb5d77b82958ff3fc6614780c80573e85bb96f59eae6
+DIST qtwayland-5.15.9-gentoo-kde-1.tar.xz 44312 BLAKE2B be255e0d292ce6555473d4ad92b656ea0f3bd7c0d4041f92e2ccfe1e456c984ff3d9307e3ff1ebe8da5d40b6a6c938e116856ff1c392171f3157cc734461e8a7 SHA512 bf099acf0cb21c3402f38dcec8a3b2f9411e8d307e303bb2eb772e5dc5872cbdb456a7d37628d72bcf4f258f3e8f9baa53081bf5c061d6338f7431f016c0e27b
DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
+DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd746e2aa6cd011ce04baa7f1f30e21c935877a684f07d5c2a0d3446e80569fa33c3fa0953b1bea86aefd64f80fda5164f3ee5648b74c2e0e8d369b9 SHA512 d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978
DIST qtwayland-everywhere-src-6.4.3.tar.xz 836240 BLAKE2B 30e3a3847328006eb580d043880556e7eeadd165fd599ab3921810360e2e2dffdea23e5aea4282cdf58b8d12f1392d70840016a187f561b3cbd6f704b1d7553d SHA512 15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch b/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch
new file mode 100644
index 000000000000..abeb7f7a1e5d
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch
@@ -0,0 +1,37 @@
+From f90f19ec0155b82981046509160849f9a3aedd9b Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sun, 19 Mar 2023 10:20:11 +0400
+Subject: [PATCH] Client: Fix the mouse being stuck in pressed state after DnD
+
+I can still reproduce the problem using QtWidgets applications
+on KDE Plasma 5.27. Both Windows and macOS QPA have a similar quirk
+and they both send a MouseButtonRelease event rather than a MouseMove
+event.
+
+Amends f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba
+
+Task-number: QTBUG-97037
+Pick-to: 6.5 6.2 5.15
+Change-Id: I864a1cb68b3660d858623f943b3958f7cafbf955
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit e3c74961b1c7415fd94678802ad7f8173d0be4c1)
+---
+ src/client/qwaylandinputdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
+index 9a0fe49d..bc05583a 100644
+--- a/src/client/qwaylandinputdevice.cpp
++++ b/src/client/qwaylandinputdevice.cpp
+@@ -845,7 +845,7 @@ void QWaylandInputDevice::Pointer::releaseButtons()
+ mButtons = Qt::NoButton;
+
+ if (auto *window = focusWindow()) {
+- MotionEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
++ ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers());
+ window->handleMouse(mParent, e);
+ }
+ }
+--
+2.40.0
+
diff --git a/dev-qt/qtwayland/qtwayland-5.15.9.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9.ebuild
new file mode 100644
index 000000000000..ef198f315ce4
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="vulkan X"
+
+DEPEND="
+ dev-libs/wayland
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtdeclarative-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+ media-libs/libglvnd
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-mouse-stuck-in-pressed-state-after-DnD.patch" # QTBUG-97037
+)
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
+}
+
+src_install() {
+ qt5-build_src_install
+ rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}