[neon/qt6/qt6-base/Neon/release] debian/patches: drop upstreamed patch

Carlos De Maine null at kde.org
Wed May 20 01:12:11 BST 2026


Git commit 212e856d7d6425a01defa729a29ad77acbe78303 by Carlos De Maine.
Committed on 20/05/2026 at 00:12.
Pushed by carlosdem into branch 'Neon/release'.

drop upstreamed patch

D  +0    -43   debian/patches/0002-c93008e4d06abb0072e0e5e57d84a4ae182ecfc0.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/212e856d7d6425a01defa729a29ad77acbe78303

diff --git a/debian/patches/0002-c93008e4d06abb0072e0e5e57d84a4ae182ecfc0.patch b/debian/patches/0002-c93008e4d06abb0072e0e5e57d84a4ae182ecfc0.patch
deleted file mode 100644
index 9964ee8..0000000
--- a/debian/patches/0002-c93008e4d06abb0072e0e5e57d84a4ae182ecfc0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c93008e4d06abb0072e0e5e57d84a4ae182ecfc0 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <mumei6102 at gmail.com>
-Date: Tue, 21 Oct 2025 19:49:17 +0200
-Subject: [PATCH] wayland: Fix crash in QWaylandShmBackingStore::scroll()
-
-Fixes a crash when monitor is unplugged while scrolling.
-
-recreateBackBufferIfNeeded() calls getBuffer() which may set
-mFrontBuffer to nullptr.
-
-Amends: 6f25f703fd37a900c139e14a33a4639502bfeae7
-
-Task-number: QTBUG-139231
-Change-Id: Ia5bedce2a3f6580c722f73446de81a26d40ea2f4
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
----
- src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
-index b853db215297..fa70b53cbd02 100644
---- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
-+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
-@@ -229,7 +229,7 @@ void QWaylandShmBackingStore::endPaint()
- // Inspired by QCALayerBackingStore.
- bool QWaylandShmBackingStore::scroll(const QRegion &region, int dx, int dy)
- {
--    if (Q_UNLIKELY(!mBackBuffer || !mFrontBuffer))
-+    if (Q_UNLIKELY(!mBackBuffer))
-         return false;
- 
-     const qreal devicePixelRatio = waylandWindow()->scale();
-@@ -241,6 +241,8 @@ bool QWaylandShmBackingStore::scroll(const QRegion &region, int dx, int dy)
-         return false;
- 
-     recreateBackBufferIfNeeded();
-+    if (!mFrontBuffer)
-+        return false;
- 
-     const QPoint scrollDelta(dx, dy);
-     const QMargins margins = windowDecorationMargins();
--- 
-2.43.0
diff --git a/debian/patches/series b/debian/patches/series
index c345263..4963726 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Neon added
-0002-c93008e4d06abb0072e0e5e57d84a4ae182ecfc0.patch
 0003-qwaylandshmbackingstore.diff
 0004-qwaylandcursor.diff
 


More information about the Neon-commits mailing list