[neon/qt/qtwayland/Neon/unstable] debian: Drop two patches that are included in the new release.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:39 BST 2024
Git commit 55e0a388f7eb0978861b79be46f3e7a6843f2b85 by Dmitry Shachnev.
Committed on 10/06/2023 at 20:57.
Pushed by jriddell into branch 'Neon/unstable'.
Drop two patches that are included in the new release.
M +3 -0 debian/changelog
D +0 -23 debian/patches/0042-Build-fixes-for-GCC-11.patch
D +0 -66 debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
M +0 -2 debian/patches/series
https://invent.kde.org/neon/qt/qtwayland/-/commit/55e0a388f7eb0978861b79be46f3e7a6843f2b85
diff --git a/debian/changelog b/debian/changelog
index 9919883..f67815e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtwayland-opensource-src (5.15.10-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Qt build-dependencies to 5.15.10.
* Bump ABI version to 5-15-10.
+ * Drop patches, included in the new release:
+ - 0042-Build-fixes-for-GCC-11.patch
+ - 0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 10 Jun 2023 20:46:10 +0300
diff --git a/debian/patches/0042-Build-fixes-for-GCC-11.patch b/debian/patches/0042-Build-fixes-for-GCC-11.patch
deleted file mode 100644
index 9804d22..0000000
--- a/debian/patches/0042-Build-fixes-for-GCC-11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e501ed58dbe44492a085587d1746a5848ac962f7 Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen at qt.io>
-Date: Mon, 18 Jan 2021 12:31:31 +0200
-Subject: [PATCH] Build fixes for GCC 11
-
-Task-number: QTBUG-89977
-Change-Id: I7e3d0964087865e8062f539f851a61f3df017dae
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit 1aa6ec2c778504d96543f6cdc2b9199a7b066fc1)
----
- tests/auto/client/shared/corecompositor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/tests/auto/client/shared/corecompositor.cpp
-+++ b/tests/auto/client/shared/corecompositor.cpp
-@@ -27,6 +27,7 @@
- ****************************************************************************/
-
- #include "corecompositor.h"
-+#include <thread>
-
- namespace MockCompositor {
-
diff --git a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch b/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
deleted file mode 100644
index b8da3b8..0000000
--- a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1ff4219d8c58f8356d9d12824948013cdfde6ac5 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at qt.io>
-Date: Fri, 11 Mar 2022 09:17:25 +0100
-Subject: [PATCH] client: Synthesize enter/leave event for popup in xdg-shell
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: QTBUG-100148
-Pick-to: 6.3 6.2 5.15
-Change-Id: I45e3156d7942cff9968674c0b253d15be7235921
-Reviewed-by: Tang Haixiang <tanghaixiang at uniontech.com>
-Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
-(cherry picked from commit 73d35d3117722cef8e94f0d2036c56ad0a5ddae9)
-
-* asturmlechner 2022-09-08: Resolve conflict with dev branch commits
- b6a3a938abd4a7fdb7ea96a38485b53f394fba17 and
- f8e3257e9b1e22d52e9c221c62b8d9b6dd1151a3
----
- .../xdg-shell/qwaylandxdgshell.cpp | 27 +++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
---- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
-+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
-@@ -221,6 +221,16 @@ QWaylandXdgSurface::Popup::~Popup()
- auto *shell = m_xdgSurface->m_shell;
- Q_ASSERT(shell->m_topmostGrabbingPopup == this);
- shell->m_topmostGrabbingPopup = m_parentXdgSurface ? m_parentXdgSurface->m_popup : nullptr;
-+ m_grabbing = false;
-+
-+ // Synthesize Qt enter/leave events for popup
-+ QWindow *leave = nullptr;
-+ if (m_xdgSurface && m_xdgSurface->window())
-+ leave = m_xdgSurface->window()->window();
-+ QWindowSystemInterface::handleLeaveEvent(leave);
-+
-+ if (QWindow *enter = QGuiApplication::topLevelAt(QCursor::pos()))
-+ QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
- }
- }
-
-@@ -442,6 +452,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
- }
- setPopup(parent);
- m_popup->grab(device, serial);
-+
-+ // Synthesize Qt enter/leave events for popup
-+ if (!parent)
-+ return;
-+ QWindow *current = QGuiApplication::topLevelAt(QCursor::pos());
-+ QWindow *leave = parent->window();
-+ if (current != leave)
-+ return;
-+
-+ QWindowSystemInterface::handleLeaveEvent(leave);
-+
-+ QWindow *enter = nullptr;
-+ if (m_popup && m_popup->m_xdgSurface && m_popup->m_xdgSurface->window())
-+ enter = m_popup->m_xdgSurface->window()->window();
-+
-+ if (enter)
-+ QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
- }
-
- void QWaylandXdgSurface::xdg_surface_configure(uint32_t serial)
diff --git a/debian/patches/series b/debian/patches/series
index 16b70b6..ae1acef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,12 +27,10 @@
0039-Reduce-memory-leakage.patch
0040-Fix-build-with-libcxx-missing-array-include.patch
0041-Only-close-popup-in-the-the-hierchary.patch
-0042-Build-fixes-for-GCC-11.patch
0043-Check-pointer-for-null-before-use-in-ASSERT.patch
0044-Use-wl_surface.damage_buffer-on-the-client-side.patch
0045-Client-clear-focus-on-touch-cancel.patch
0046-Guard-mResizeDirty-by-the-correctMutex.patch
-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
0051-Avoid-calling-requestUpdate-from-wrong-thread.patch
More information about the Neon-commits
mailing list