[neon/qt/qtwayland/Neon/release] debian: Add patches from KDE's Qt 5 Patch Collection up to 2022-06-20.

Dmitry Shachnev null at kde.org
Fri Jul 15 12:22:56 BST 2022


Git commit 08d2436c8264020b1d7566220355d12edc4675d4 by Dmitry Shachnev.
Committed on 03/07/2022 at 14:12.
Pushed by jriddell into branch 'Neon/release'.

Add patches from KDE's Qt 5 Patch Collection up to 2022-06-20.

M  +1    -0    debian/changelog
A  +26   -0    debian/patches/0039-Reduce-memory-leakage.patch
A  +27   -0    debian/patches/0040-Fix-build-with-libcxx-missing-array-include.patch
M  +2    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtwayland/commit/08d2436c8264020b1d7566220355d12edc4675d4

diff --git a/debian/changelog b/debian/changelog
index dd2ea6d..55c2f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwayland-opensource-src (5.15.5-1) UNRELEASED; urgency=medium
   * Bump ABI version to 5-15-5.
   * Drop 0003-Include-locale.h-for-setlocale-LC_CTYPE.patch, included in the
     new release.
+  * Add patches from KDE's Qt 5 Patch Collection up to 2022-06-20.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Jul 2022 16:44:58 +0300
 
diff --git a/debian/patches/0039-Reduce-memory-leakage.patch b/debian/patches/0039-Reduce-memory-leakage.patch
new file mode 100644
index 0000000..9da631e
--- /dev/null
+++ b/debian/patches/0039-Reduce-memory-leakage.patch
@@ -0,0 +1,26 @@
+From 1e58585693eb337fc1c80e10987ed27115255d97 Mon Sep 17 00:00:00 2001
+From: Ulf Hermann <ulf.hermann at qt.io>
+Date: Tue, 22 Feb 2022 12:31:08 +0100
+Subject: [PATCH] Reduce memory leakage
+
+We need to clean up the event queue when we're done.
+
+Change-Id: I13a9eb77e978f4eab227a3a28dab8ebc8de94405
+Reviewed-by: David Edmundson <davidedmundson at kde.org>
+(cherry picked from commit 1264e5f565d8fb7ac200e4b00531ab876922458f)
+---
+ src/client/qwaylanddisplay.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/src/client/qwaylanddisplay.cpp
++++ b/src/client/qwaylanddisplay.cpp
+@@ -379,6 +379,9 @@ QWaylandDisplay::~QWaylandDisplay(void)
+ #endif
+     if (mDisplay)
+         wl_display_disconnect(mDisplay);
++
++    if (m_frameEventQueue)
++        wl_event_queue_destroy(m_frameEventQueue);
+ }
+ 
+ // Steps which is called just after constructor. This separates registry_global() out of the constructor
diff --git a/debian/patches/0040-Fix-build-with-libcxx-missing-array-include.patch b/debian/patches/0040-Fix-build-with-libcxx-missing-array-include.patch
new file mode 100644
index 0000000..fd99141
--- /dev/null
+++ b/debian/patches/0040-Fix-build-with-libcxx-missing-array-include.patch
@@ -0,0 +1,27 @@
+From 64fa557eb30fc1219bec50a45107ea1a983411ed Mon Sep 17 00:00:00 2001
+From: Sam James <sam at gentoo.org>
+Date: Sat, 18 Jun 2022 17:11:11 +0100
+Subject: [PATCH] Fix build with libcxx (missing array include)
+
+Bug: https://bugs.gentoo.org/833488
+
+Task-number: QTBUG-104435
+Change-Id: I06384761a5560b81b675e6c4ae498bb93dcb4f4f
+Pick-to: 5.15 6.2 6.3 6.4
+Reviewed-by: Marc Mutz <marc.mutz at qt.io>
+(cherry picked from commit 5065013b0c2346b5918a2681ae2e58046140e8a7)
+---
+ .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h           | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -41,6 +41,8 @@
+ #include <QtCore/QTextStream>
+ #include <QtGui/QOpenGLTexture>
+ 
++#include <array>
++
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 70e6cf5..83c677a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,5 +35,7 @@
 0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
 0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
 0038-use-poll-2-when-reading-from-clipboard.patch
+0039-Reduce-memory-leakage.patch
+0040-Fix-build-with-libcxx-missing-array-include.patch
 skip_animated_cursor_test.diff
 gcc_11.diff



More information about the Neon-commits mailing list