[meta-arago][master][PATCHv2] qtbase: remove serial event 0 handling

<[email protected]> Fri, 24 Apr 2026 17:37:50 -0500
Newsgroups org.yoctoproject.lists.meta-arago
Message-ID <[email protected]>
From: Randolph Sapp <[email protected]>

Serial number 0 is perfectly valid, though maybe a little uncommon. It
shouldn't be treated differently or used to indicate a special event.

This project has a CLA that we haven't signed yet. Carry an local patch
until the upstream bug is resolved.

Bug: https://qt-project.atlassian.net/browse/QTBUG-146015
Signed-off-by: Randolph Sapp <[email protected]>
---

v2: whitespace as usual

 .../qt6-layer/recipes-qt/qt6/qtbase-arago.inc |  6 +++
 ...tdevice.cpp-remove-serial-0-handling.patch | 42 +++++++++++++++++++
 .../recipes-qt/qt6/qtbase_git.bbappend        |  4 ++
 3 files changed, 52 insertions(+)
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/q=
t6/qtbase-arago.inc
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/q=
t6/qtbase/0001-qwaylandinputdevice.cpp-remove-serial-0-handling.patch
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/q=
t6/qtbase_git.bbappend

diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtba=
se-arago.inc b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qt=
base-arago.inc
new file mode 100644
index 00000000..3ac24295
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase-arag=
o.inc
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend :=3D "${THISDIR}/qtbase:"
+
+SRC_URI:append =3D " \
+    file://0001-qwaylandinputdevice.cpp-remove-serial-0-handling.patch \
+"
+PR:append =3D ".arago0"
diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtba=
se/0001-qwaylandinputdevice.cpp-remove-serial-0-handling.patch b/meta-arago=
-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase/0001-qwaylandinputde=
vice.cpp-remove-serial-0-handling.patch
new file mode 100644
index 00000000..4c1a0d40
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase/0001=
-qwaylandinputdevice.cpp-remove-serial-0-handling.patch
@@ -0,0 +1,42 @@
+From f10c63a7391adcf5c28c3378e9d72ee52b5bba97 Mon Sep 17 00:00:00 2001
+From: Randolph Sapp <[email protected]>
+Date: Fri, 24 Apr 2026 15:14:26 -0500
+Subject: [PATCH] qwaylandinputdevice.cpp: remove serial 0 handling
+
+Serial number 0 is perfectly valid, though maybe a little uncommon. It
+shouldn't be treated differently or used to indicate a special event.
+
+Signed-off-by: Randolph Sapp <[email protected]>
+Upstream-Status: Denied
+Bug: https://qt-project.atlassian.net/browse/QTBUG-146015
+
+Yet another CLA we won't sign.
+---
+ src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/p=
lugins/platforms/wayland/qwaylandinputdevice.cpp
+index b9ca27e6f04..84b7457b0a1 100644
+--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
++++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+@@ -237,9 +237,6 @@ void QWaylandInputDevice::Pointer::updateCursorTheme()
+
+ void QWaylandInputDevice::Pointer::updateCursor()
+ {
+-    if (mEnterSerial =3D=3D 0)
+-        return;
+-
+     auto shape =3D seat()->mCursor.shape;
+
+     if (shape =3D=3D Qt::BlankCursor) {
+@@ -882,7 +879,6 @@ void QWaylandInputDevice::Pointer::invalidateFocus()
+         disconnect(mFocus.data(), &QObject::destroyed, this, &Pointer::ha=
ndleFocusDestroyed);
+         mFocus =3D nullptr;
+     }
+-    mEnterSerial =3D 0;
+ }
+
+ void QWaylandInputDevice::Pointer::releaseButtons()
+--
+2.53.0
+
diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtba=
se_git.bbappend b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6=
/qtbase_git.bbappend
new file mode 100644
index 00000000..dcf0954f
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_git.=
bbappend
@@ -0,0 +1,4 @@
+QTBASE_ARAGO =3D ""
+QTBASE_ARAGO:arago =3D "qtbase-arago.inc"
+
+require ${QTBASE_ARAGO}
--=20
2.53.0