[neon/qt/qtwayland/Neon/unstable] debian: Drop 0075-client-Fix-infinite-recursion-with-text-input-v2.patch.

Dmitry Shachnev null at kde.org
Mon Apr 29 17:44:39 BST 2024


Git commit 20c313b68d1358519ad5e7cedd3035c3dbac1b8e by Dmitry Shachnev.
Committed on 09/03/2024 at 16:55.
Pushed by jriddell into branch 'Neon/unstable'.

Drop 0075-client-Fix-infinite-recursion-with-text-input-v2.patch.

Included in the new release.

M  +2    -0    debian/changelog
D  +0    -58   debian/patches/0075-client-Fix-infinite-recursion-with-text-input-v2.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtwayland/-/commit/20c313b68d1358519ad5e7cedd3035c3dbac1b8e

diff --git a/debian/changelog b/debian/changelog
index c4c4b72..05e93cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtwayland-opensource-src (5.15.13-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.15.13.
   * Bump ABI version to 5-15-13.
   * Replace pkg-config build-dependency with pkgconf.
+  * Drop 0075-client-Fix-infinite-recursion-with-text-input-v2.patch,
+    included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Mar 2024 14:42:18 +0300
 
diff --git a/debian/patches/0075-client-Fix-infinite-recursion-with-text-input-v2.patch b/debian/patches/0075-client-Fix-infinite-recursion-with-text-input-v2.patch
deleted file mode 100644
index 54d7eae..0000000
--- a/debian/patches/0075-client-Fix-infinite-recursion-with-text-input-v2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f21d34890dccc356a1a798e55b865749cdc4fd70 Mon Sep 17 00:00:00 2001
-From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
-Date: Thu, 12 Jan 2023 14:56:18 +0100
-Subject: [PATCH] client: Fix infinite recursion with text-input-v2
-
-It was possible to get into an infinite recursion when
-double-clicking an entry in an item view to edit it.
-
-What would happen is that the editor takes focus, and we call
-commit on the input method commit in case the previous focused
-widget has pending input that needs to be committed. The
-subsequent method event then causes the QAbstractItemView to
-set focus, and since we have not yet updated the focus in the
-previous call, we end up in an infinite recursion, eventually
-crashing when the stack overflows.
-
-As a guard for this, we only send an input method event when there
-is actually pre-edit text to commit, and we reset the pre-edit
-text immediately so that any subsequent call will just exit.
-
-[ChangeLog][QtWaylandClient] Fixed a possible crash when editing
-a field in an item view.
-
-Pick-to: 5.15 6.2 6.4 6.5
-Fixes: QTBUG-109302
-Change-Id: I45237c80e53b1386705279899e19319180d78fa1
-Reviewed-by: Liang Qi <liang.qi at qt.io>
-Reviewed-by: Paul Olav Tvete <paul.tvete at qt.io>
-Reviewed-by: Inho Lee <inho.lee at qt.io>
-(cherry picked from commit db4afd9caf037cfff7aca8b130d326c340b7fed0)
-
-* asturmlechner 2023-08-14: Resolve conflict with dev branch commit
-  af8f8c33ea885f472682f98e0699721f50b1f020 - change applied in
-  qwaylandinputcontext.cpp instead.
----
- src/client/qwaylandinputcontext.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/src/client/qwaylandinputcontext.cpp
-+++ b/src/client/qwaylandinputcontext.cpp
-@@ -93,9 +93,14 @@ void QWaylandTextInput::reset()
- void QWaylandTextInput::commit()
- {
-     if (QObject *o = QGuiApplication::focusObject()) {
--        QInputMethodEvent event;
--        event.setCommitString(m_preeditCommit);
--        QCoreApplication::sendEvent(o, &event);
-+        if (!m_preeditCommit.isEmpty()) {
-+
-+            QInputMethodEvent event;
-+            event.setCommitString(m_preeditCommit);
-+            m_preeditCommit = QString();
-+
-+            QCoreApplication::sendEvent(o, &event);
-+        }
-     }
- 
-     reset();
diff --git a/debian/patches/series b/debian/patches/series
index cfa569c..00c5ea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,7 +51,6 @@
 0072-Convert-cursor-bitmap-to-supported-format.patch
 0073-Replace-scale-with-devicePixelRatio-for-non-integer-.patch
 0074-Client-Fix-buffer-damage.patch
-0075-client-Fix-infinite-recursion-with-text-input-v2.patch
 0076-Client-Fix-the-mouse-being-stuck-in-pressed-state-af.patch
 0077-Client-Commit-the-initial-surface-state-explicitly.patch
 0078-tests-Fix-tst_xdgshell-minMaxSize.patch



More information about the Neon-commits mailing list