[neon/qt/qtwayland/Neon/unstable] debian: Drop 0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch.

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


Git commit 0b39aad83b89c6d574e2c63cf3d3512b84e6ca81 by Dmitry Shachnev.
Committed on 04/12/2022 at 15:32.
Pushed by jriddell into branch 'Neon/unstable'.

Drop 0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch.

Included in the new release.

M  +2    -0    debian/changelog
D  +0    -26   debian/patches/0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtwayland/-/commit/0b39aad83b89c6d574e2c63cf3d3512b84e6ca81

diff --git a/debian/changelog b/debian/changelog
index 594a095..115ca38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtwayland-opensource-src (5.15.7-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.7.
   * Bump ABI version to 5-15-7.
+  * Drop 0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch,
+    included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 04 Dec 2022 17:49:34 +0300
 
diff --git a/debian/patches/0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch b/debian/patches/0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
deleted file mode 100644
index f57806c..0000000
--- a/debian/patches/0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19d0878e56094b5cced1154ce07f566f2b147e2a Mon Sep 17 00:00:00 2001
-From: Paul Olav Tvete <paul.tvete at qt.io>
-Date: Tue, 14 Sep 2021 11:56:23 +0200
-Subject: [PATCH] Wayland client: Fix crash when windows are shown/hidden
- during drag
-
-Fixes: QTBUG-87624
-Pick-to: 6.2 5.15
-Change-Id: I1b9443df091878abcd4fbe9c55927cb819aebd59
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit c64c5d3849b40617e1de0295f8690f354cab2b3a)
----
- src/client/qwaylanddatadevice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/client/qwaylanddatadevice.cpp
-+++ b/src/client/qwaylanddatadevice.cpp
-@@ -169,7 +169,7 @@ void QWaylandDataDevice::data_device_drop()
- 
- void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, wl_fixed_t x, wl_fixed_t y, wl_data_offer *id)
- {
--    auto *dragWaylandWindow = QWaylandWindow::fromWlSurface(surface);
-+    auto *dragWaylandWindow = surface ? QWaylandWindow::fromWlSurface(surface) : nullptr;
-     if (!dragWaylandWindow)
-         return; // Ignore foreign surfaces
- 
diff --git a/debian/patches/series b/debian/patches/series
index e80898d..e96df0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@
 0008-Fix-remove-listener.patch
 0009-Hook-up-queryKeyboardModifers.patch
 0011-Correctly-detect-if-image-format-is-supported-by-QIm.patch
-0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
 0013-Client-Don-t-always-recreate-frame-callbacks.patch
 0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
 0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch



More information about the Neon-commits mailing list