[neon/qt/qtwayland/Neon/unstable] debian: Drop patches that are included in the new release.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:39 BST 2024
Git commit 9e4fc327750c78a90cf2f349afb55e0baa8d2ad4 by Dmitry Shachnev.
Committed on 22/04/2023 at 14:35.
Pushed by jriddell into branch 'Neon/unstable'.
Drop patches that are included in the new release.
M +8 -0 debian/changelog
D +0 -24 debian/patches/0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
D +0 -24 debian/patches/0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
D +0 -30 debian/patches/0030-Cursor-position-0-should-still-show-the-cursor.patch
D +0 -83 debian/patches/0031-Update-the-preedit-styling-mapping.patch
D +0 -45 debian/patches/0035-client-update-button-state-and-etc-in-pointer_leave.patch
D +0 -57 debian/patches/0050-Fix-missing-update-when-toggling-client-side-decorat.patch
D +0 -37 debian/patches/0052-Client-support-high-dpi-mode-for-window-icon.patch
M +0 -7 debian/patches/series
https://invent.kde.org/neon/qt/qtwayland/-/commit/9e4fc327750c78a90cf2f349afb55e0baa8d2ad4
diff --git a/debian/changelog b/debian/changelog
index a85c003..be090ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ qtwayland-opensource-src (5.15.9-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Qt build-dependencies to 5.15.9.
* Bump ABI version to 5-15-9.
+ * Drop patches that are included in the new release:
+ - 0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
+ - 0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
+ - 0030-Cursor-position-0-should-still-show-the-cursor.patch
+ - 0031-Update-the-preedit-styling-mapping.patch
+ - 0035-client-update-button-state-and-etc-in-pointer_leave.patch
+ - 0050-Fix-missing-update-when-toggling-client-side-decorat.patch
+ - 0052-Client-support-high-dpi-mode-for-window-icon.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 22 Apr 2023 16:58:13 +0300
diff --git a/debian/patches/0018-Set-preedit-cursor-when-cursor-equals-to-0.patch b/debian/patches/0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
deleted file mode 100644
index 4f5496d..0000000
--- a/debian/patches/0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1a476429c2d9034322d5b3366ce53375e484353a Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt at gmail.com>
-Date: Sat, 18 Dec 2021 23:42:49 -0800
-Subject: [PATCH] Set preedit cursor when cursor equals to 0
-
-Pick-to: 6.3 6.2 5.15
-Change-Id: I832fbb22d973b36ac4ab51570fc53bc2e4c3ed58
-Reviewed-by: Liang Qi <liang.qi at qt.io>
-(cherry picked from commit 719a55be13bdadfa659a732755f280e276a894bd)
----
- src/shared/qwaylandinputmethodeventbuilder.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/shared/qwaylandinputmethodeventbuilder.cpp
-+++ b/src/shared/qwaylandinputmethodeventbuilder.cpp
-@@ -151,7 +151,7 @@ QInputMethodEvent QWaylandInputMethodEventBuilder::buildPreedit(const QString &t
- {
- QList<QInputMethodEvent::Attribute> attributes;
-
-- if (m_preeditCursor < 0) {
-+ if (m_preeditCursor <= 0) {
- attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, 0, 0, QVariant()));
- } else if (m_preeditCursor > 0) {
- attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, indexFromWayland(text, m_preeditCursor), 1, QVariant()));
diff --git a/debian/patches/0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch b/debian/patches/0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
deleted file mode 100644
index 236b29b..0000000
--- a/debian/patches/0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 506d0372178134f208fd08b3f6b9499fc0e14a5e Mon Sep 17 00:00:00 2001
-From: Joni Poikelin <joni.poikelin at qt.io>
-Date: Thu, 3 Feb 2022 14:01:50 +0200
-Subject: [PATCH] Fix crash if no input method module could be loaded
-
-Pick-to: 6.2 6.3 5.15
-Change-Id: I8f346def616606a6c5540856bd08a84ee7ed5ca2
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit 49fb7248f6ab7de046e2179c7861951ea1169e9b)
----
- src/client/qwaylandintegration.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/client/qwaylandintegration.cpp
-+++ b/src/client/qwaylandintegration.cpp
-@@ -491,7 +491,7 @@ void QWaylandIntegration::reconfigureInputContext()
- }
- #endif
-
-- qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
-+ qCDebug(lcQpaWayland) << "using input method:" << (inputContext() ? inputContext()->metaObject()->className() : "<none>");
- }
-
- QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName)
diff --git a/debian/patches/0030-Cursor-position-0-should-still-show-the-cursor.patch b/debian/patches/0030-Cursor-position-0-should-still-show-the-cursor.patch
deleted file mode 100644
index 5a8fafc..0000000
--- a/debian/patches/0030-Cursor-position-0-should-still-show-the-cursor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2d0bd70b55ebde2e22d0b95e8122235f90c8f9f1 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt at gmail.com>
-Date: Tue, 8 Feb 2022 07:11:25 -0800
-Subject: [PATCH] Cursor position == 0 should still show the cursor
-
-Otherwise the cursor would be hidden even if preedit is empty.
-Amends 719a55be13bdadfa659a732755f280e276a894bd
-
-Pick-to: 5.15 6.2 6.3
-Change-Id: I320733b917779b7b51aa4a28eaea411fdb10a318
-Reviewed-by: Liang Qi <liang.qi at qt.io>
-(cherry picked from commit 31ae194e295651d9ece03408630d2358acd4f7b4)
----
- src/shared/qwaylandinputmethodeventbuilder.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/shared/qwaylandinputmethodeventbuilder.cpp
-+++ b/src/shared/qwaylandinputmethodeventbuilder.cpp
-@@ -151,9 +151,9 @@ QInputMethodEvent QWaylandInputMethodEventBuilder::buildPreedit(const QString &t
- {
- QList<QInputMethodEvent::Attribute> attributes;
-
-- if (m_preeditCursor <= 0) {
-+ if (m_preeditCursor < 0) {
- attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, 0, 0, QVariant()));
-- } else if (m_preeditCursor > 0) {
-+ } else {
- attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, indexFromWayland(text, m_preeditCursor), 1, QVariant()));
- }
-
diff --git a/debian/patches/0031-Update-the-preedit-styling-mapping.patch b/debian/patches/0031-Update-the-preedit-styling-mapping.patch
deleted file mode 100644
index ee9ef41..0000000
--- a/debian/patches/0031-Update-the-preedit-styling-mapping.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From f0f7b2bea822f73ae00fcfd4ee1679596d550a20 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt at gmail.com>
-Date: Wed, 22 Dec 2021 10:42:38 -0800
-Subject: [PATCH] Update the preedit styling mapping
-
-- None mapping to no style.
-- Default/Underline mapping to underline.
-- Highlight/Selection mapping to background color/text color with highlight/highlight
-text with underline.
-- Active/Inactive mapping to bold text with underline.
-- Incorrect mapping to red wave underline.
-
-Pick-to: 5.15 6.2 6.3
-Change-Id: Iab51d671b8f83aece8596f7f7610de19343fcceb
-Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
-(cherry picked from commit f1fb5d9e568a24e213ee41e82a1142cef56f1098)
----
- .../qwaylandinputmethodeventbuilder.cpp | 31 ++++++++++++-------
- 1 file changed, 20 insertions(+), 11 deletions(-)
-
---- a/src/shared/qwaylandinputmethodeventbuilder.cpp
-+++ b/src/shared/qwaylandinputmethodeventbuilder.cpp
-@@ -39,7 +39,10 @@
-
- #include "qwaylandinputmethodeventbuilder_p.h"
-
-+#include <QBrush>
-+#include <QGuiApplication>
- #include <QInputMethod>
-+#include <QPalette>
- #include <QTextCharFormat>
-
- #ifdef QT_BUILD_WAYLANDCOMPOSITOR_LIB
-@@ -81,32 +84,38 @@ void QWaylandInputMethodEventBuilder::addPreeditStyling(uint32_t index, uint32_t
- QTextCharFormat format;
-
- switch (style) {
-- case 0:
-- case 1:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_NONE:
-+ break;
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_DEFAULT:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_UNDERLINE:
- format.setFontUnderline(true);
- format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
- m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
- break;
-- case 2:
-- case 3:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_ACTIVE:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_INACTIVE:
- format.setFontWeight(QFont::Bold);
- format.setFontUnderline(true);
- format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
- m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
- break;
-- case 4:
-- format.setFontUnderline(true);
-- format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
-- m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_HIGHLIGHT:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_SELECTION:
-+ {
-+ format.setFontUnderline(true);
-+ format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
-+ QPalette palette = qApp->palette();
-+ format.setBackground(QBrush(palette.color(QPalette::Active, QPalette::Highlight)));
-+ format.setForeground(QBrush(palette.color(QPalette::Active, QPalette::HighlightedText)));
-+ m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
-+ }
- break;
-- case 5:
-+ case ZWP_TEXT_INPUT_V2_PREEDIT_STYLE_INCORRECT:
- format.setFontUnderline(true);
- format.setUnderlineStyle(QTextCharFormat::WaveUnderline);
- format.setUnderlineColor(QColor(Qt::red));
- m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
- break;
--// case QtWayland::wl_text_input::preedit_style_selection:
--// case QtWayland::wl_text_input::preedit_style_none:
- default:
- break;
- }
diff --git a/debian/patches/0035-client-update-button-state-and-etc-in-pointer_leave.patch b/debian/patches/0035-client-update-button-state-and-etc-in-pointer_leave.patch
deleted file mode 100644
index 402a86d..0000000
--- a/debian/patches/0035-client-update-button-state-and-etc-in-pointer_leave.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 169052d99391eef62c181c8b5b107280688045d1 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at qt.io>
-Date: Wed, 9 Mar 2022 10:47:42 +0100
-Subject: [PATCH] client: update button state and etc in pointer_leave()
-
-The cleanup work needs to be done even the surface is null, for
-example, a window was closed in mouse press handler, then will not
-get a mouse release.
-
-Fixes: QTBUG-100942
-Pick-to: 5.15 6.2 6.3
-Change-Id: I637a6744909ddbe62bdeba6b21494e5a6ae7fa9f
-Reviewed-by: Tang Haixiang <tanghaixiang at uniontech.com>
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit 409d1080f25b653b3ff3f57c9776c5c390912206)
----
- src/client/qwaylandinputdevice.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -685,6 +685,11 @@ public:
-
- void QWaylandInputDevice::Pointer::pointer_leave(uint32_t time, struct wl_surface *surface)
- {
-+ invalidateFocus();
-+ mButtons = Qt::NoButton;
-+
-+ mParent->mTime = time;
-+
- // The event may arrive after destroying the window, indicated by
- // a null surface.
- if (!surface)
-@@ -696,11 +701,6 @@ void QWaylandInputDevice::Pointer::pointer_leave(uint32_t time, struct wl_surfac
-
- if (!QWaylandWindow::mouseGrab())
- setFrameEvent(new LeaveEvent(window, mSurfacePos, mGlobalPos));
--
-- invalidateFocus();
-- mButtons = Qt::NoButton;
--
-- mParent->mTime = time;
- }
-
- class MotionEvent : public QWaylandPointerEvent
diff --git a/debian/patches/0050-Fix-missing-update-when-toggling-client-side-decorat.patch b/debian/patches/0050-Fix-missing-update-when-toggling-client-side-decorat.patch
deleted file mode 100644
index 1821b38..0000000
--- a/debian/patches/0050-Fix-missing-update-when-toggling-client-side-decorat.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 60c7d26098ec6b0da695e97e6f7cc5cd23fa2c56 Mon Sep 17 00:00:00 2001
-From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
-Date: Tue, 9 Nov 2021 13:23:41 +0100
-Subject: [PATCH] Fix missing update when toggling client-side decorations
-
-When CSD is toggled while a window is showing, it would change the
-size and recreate the buffers, but since the widget area remained
-the same size, we would not trigger a redraw. The result was that
-when you got any update to the window, it would redraw the widgets
-that had changed, and the rest would be transparent.
-
-Since this is a fairly specialized case, we fix it the simple way,
-by just issuing an extra update when it happens.
-
-This also required an update to the surface test, since there is
-an additional buffer commit in the beginning of the sequence now.
-
-Pick-to: 5.15 6.2 6.3
-Fixes: QTBUG-95032
-Change-Id: Ic4bdb9c66a2ea76546926dd622f2d2dac5dce10c
-Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
-Reviewed-by: Liang Qi <liang.qi at qt.io>
-(cherry picked from commit af7b60ade5c4be81cbc58eb18307c017d5594071)
----
- src/client/qwaylandwindow.cpp | 7 +++++++
- tests/auto/client/surface/tst_surface.cpp | 4 ++++
- 2 files changed, 11 insertions(+)
-
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -867,6 +867,13 @@ bool QWaylandWindow::createDecoration()
- subsurf->set_position(pos.x() + m.left(), pos.y() + m.top());
- }
- sendExposeEvent(QRect(QPoint(), geometry().size()));
-+
-+ // This is a special case where the buffer is recreated, but since
-+ // the content rect remains the same, the widgets remain the same
-+ // size and are not redrawn, leaving the new buffer empty. As a simple
-+ // work-around, we trigger a full extra update whenever the client-side
-+ // window decorations are toggled while the window is showing.
-+ window()->requestUpdate();
- }
-
- return mWindowDecoration;
---- a/tests/auto/client/surface/tst_surface.cpp
-+++ b/tests/auto/client/surface/tst_surface.cpp
-@@ -129,6 +129,10 @@ void tst_surface::waitForFrameCallbackGl()
- // Make sure we follow frame callbacks for some frames
- for (int i = 0; i < 5; ++i) {
- xdgPingAndWaitForPong(); // Make sure things have happened on the client
-+ if (!qEnvironmentVariableIntValue("QT_WAYLAND_DISABLE_WINDOWDECORATION") && i == 0) {
-+ QCOMPARE(bufferSpy.count(), 1);
-+ bufferSpy.removeFirst();
-+ }
- exec([&] {
- QVERIFY(bufferSpy.empty()); // Make sure no extra buffers have arrived
- QVERIFY(!xdgToplevel()->surface()->m_waitingFrameCallbacks.empty());
diff --git a/debian/patches/0052-Client-support-high-dpi-mode-for-window-icon.patch b/debian/patches/0052-Client-support-high-dpi-mode-for-window-icon.patch
deleted file mode 100644
index 4d8dc93..0000000
--- a/debian/patches/0052-Client-support-high-dpi-mode-for-window-icon.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 78ccf62673b20111da0579e2a8e0631894099348 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at qt.io>
-Date: Mon, 13 Dec 2021 13:01:59 +0100
-Subject: [PATCH] Client: support high-dpi mode for window icon
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: QTBUG-90530
-Pick-to: 6.3 6.2 5.15
-Change-Id: Ib1f36e1cb89352dfac8a385a7b097cfc0226e813
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
-(cherry picked from commit fc91cd6b1306c6d452cbddab3c2289ccb92218d6)
----
- src/plugins/decorations/bradient/main.cpp | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
---- a/src/plugins/decorations/bradient/main.cpp
-+++ b/src/plugins/decorations/bradient/main.cpp
-@@ -164,13 +164,10 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
- // Window icon
- QIcon icon = waylandWindow()->windowIcon();
- if (!icon.isNull()) {
-- QPixmap pixmap = icon.pixmap(QSize(128, 128));
-- QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
--
- QRectF iconRect(0, 0, 22, 22);
-- p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4,
-- margins().left() + BUTTON_SPACING, 4),
-- scaled, iconRect);
-+ iconRect.adjust(margins().left() + BUTTON_SPACING, 4,
-+ margins().left() + BUTTON_SPACING, 4),
-+ icon.paint(&p, iconRect.toRect());
- }
-
- // Window title
diff --git a/debian/patches/series b/debian/patches/series
index b562f8e..af76c45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,21 +11,16 @@
0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
-0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
0019-Client-Implement-DataDeviceV3.patch
0020-Client-Delay-deletion-of-QDrag-object-until-after-we.patch
0021-Client-Avoid-processing-of-events-when-showing-windo.patch
0022-Handle-registry_global-out-of-constructor.patch
0023-Connect-flushRequest-after-forceRoundTrip.patch
0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
-0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
0029-Client-Remove-mWaitingForUpdateDelivery.patch
-0030-Cursor-position-0-should-still-show-the-cursor.patch
-0031-Update-the-preedit-styling-mapping.patch
0032-client-Simplify-round-trip-behavior.patch
0033-Client-Fix-opaque-region-setter.patch
0034-Use-proper-dependencies-in-compile-tests.patch
-0035-client-update-button-state-and-etc-in-pointer_leave.patch
0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
0038-use-poll-2-when-reading-from-clipboard.patch
@@ -40,9 +35,7 @@
0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
0048-Fix-compile-tests.patch
0049-Use-CRLF-line-delimiter-for-text-uri-list-data.patch
-0050-Fix-missing-update-when-toggling-client-side-decorat.patch
0051-Avoid-calling-requestUpdate-from-wrong-thread.patch
-0052-Client-support-high-dpi-mode-for-window-icon.patch
0053-Call-finishDrag-in-QWaylandDataDevice-dragSourceCanc.patch
0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch
0055-Client-Ensure-that-wl_surface-lives-as-long-as-qtqui.patch
More information about the Neon-commits
mailing list