[neon/qt/qtbase/Neon/release] debian: Drop patches that are included in the new release.

[Dmitry Shachnev]

Git commit 11b545ab847a352110365e43e6e7b4710b360cbb by Dmitry Shachnev.
Committed on 03/03/2022 at 19:24.
Pushed by jriddell into branch 'Neon/release'.

Drop patches that are included in the new release.

- xcb_screens_uaf.patch
- qnam_connect_memory_leak.diff
- qiodevice_readline_memory.diff

M  +4    -0    debian/changelog
D  +0    -21   debian/patches/qiodevice_readline_memory.diff
D  +0    -25   debian/patches/qnam_connect_memory_leak.diff
M  +0    -3    debian/patches/series
D  +0    -26   debian/patches/xcb_screens_uaf.patch

https://invent.kde.org/neon/qt/qtbase/commit/11b545ab847a352110365e43e6e7b4710b360cbb

diff --git a/debian/changelog b/debian/changelog
index 8ca0d1a..ac3c6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtbase-opensource-src (5.15.3+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Update debian/watch for new file names.
+  * Drop patches that are included in the new release:
+    - xcb_screens_uaf.patch
+    - qnam_connect_memory_leak.diff
+    - qiodevice_readline_memory.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Mar 2022 22:13:09 +0300
 
diff --git a/debian/patches/qiodevice_readline_memory.diff b/debian/patches/qiodevice_readline_memory.diff
deleted file mode 100644
index 4ce27af..0000000
--- a/debian/patches/qiodevice_readline_memory.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix allocated memory of QByteArray returned by QIODevice::readLine
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6485b6d45ad165cf
-Last-Update: 2021-02-20
-
---- a/src/corelib/io/qiodevice.cpp
-+++ b/src/corelib/io/qiodevice.cpp
-@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 ma
-     } else
-         readBytes = readLine(result.data(), result.size());
- 
--    if (readBytes <= 0)
-+    if (readBytes <= 0) {
-         result.clear();
--    else
-+    } else {
-         result.resize(readBytes);
-+        result.squeeze();
-+    }
- 
-     return result;
- }
diff --git a/debian/patches/qnam_connect_memory_leak.diff b/debian/patches/qnam_connect_memory_leak.diff
deleted file mode 100644
index f16b2bc..0000000
--- a/debian/patches/qnam_connect_memory_leak.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: QNAM: work around QObject finicky orphan cleanup details
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=0807f16eb407eaf8
-Last-Update: 2021-01-26
-
---- a/src/network/access/qnetworkreplyhttpimpl.cpp
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
-@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postR
- 
-     // For the synchronous HTTP, this is the normal way the delegate gets deleted
-     // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished
--    QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+    QMetaObject::Connection threadFinishedConnection =
-+            QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+
-+    // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned
-+    // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal,
-+    // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect
-+    // it on deletion so that it cleans up the orphan immediately.
-+    QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() {
-+        if (bool(threadFinishedConnection))
-+            QObject::disconnect(threadFinishedConnection);
-+    });
- 
-     // Set the properties it needs
-     delegate->httpRequest = httpRequest;
diff --git a/debian/patches/series b/debian/patches/series
index f37d1c6..664eef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
 # Backported from upstream.
-xcb_screens_uaf.patch
-qnam_connect_memory_leak.diff
 gcc_11_limits.diff
-qiodevice_readline_memory.diff
 mime_globs.diff
 fix-invalid-pointer-return-with-QGridLayout.diff
 fix-misplacement-of-placeholder-text-in-QLineEdit.diff
diff --git a/debian/patches/xcb_screens_uaf.patch b/debian/patches/xcb_screens_uaf.patch
deleted file mode 100644
index 600e10d..0000000
--- a/debian/patches/xcb_screens_uaf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Avoid use-after-free in QXcbConnection::initializeScreens()
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=86b8c5c3f32c2457
-Last-Update: 2020-11-23
-
---- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
-@@ -290,6 +290,8 @@ void QXcbConnection::initializeScreens()
-             // RRGetScreenResources in this case.
-             auto resources_current = Q_XCB_REPLY(xcb_randr_get_screen_resources_current,
-                                                  xcb_connection(), xcbScreen->root);
-+            decltype(Q_XCB_REPLY(xcb_randr_get_screen_resources,
-+                                 xcb_connection(), xcbScreen->root)) resources;
-             if (!resources_current) {
-                 qWarning("failed to get the current screen resources");
-             } else {
-@@ -300,8 +302,8 @@ void QXcbConnection::initializeScreens()
-                     timestamp = resources_current->config_timestamp;
-                     outputs = xcb_randr_get_screen_resources_current_outputs(resources_current.get());
-                 } else {
--                    auto resources = Q_XCB_REPLY(xcb_randr_get_screen_resources,
--                                                 xcb_connection(), xcbScreen->root);
-+                    resources = Q_XCB_REPLY(xcb_randr_get_screen_resources,
-+                                            xcb_connection(), xcbScreen->root);
-                     if (!resources) {
-                         qWarning("failed to get the screen resources");
-                     } else {