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

Dmitry Shachnev null at kde.org
Thu Jul 14 13:14:44 BST 2022


Git commit 16ab6c97bf87b82053ec0ab79572228e72865028 by Dmitry Shachnev.
Committed on 12/05/2022 at 21:10.
Pushed by jriddell into branch 'Neon/release'.

Drop patches that are included in the new release.

- fix-invalid-pointer-return-with-QGridLayout.diff
- gcc-11-qtconcurrentthreadengine.diff

M  +3    -0    debian/changelog
D  +0    -113  debian/patches/fix-invalid-pointer-return-with-QGridLayout.diff
D  +0    -19   debian/patches/gcc-11-qtconcurrentthreadengine.diff
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/16ab6c97bf87b82053ec0ab79572228e72865028

diff --git a/debian/changelog b/debian/changelog
index 6eee10e..2cfe893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtbase-opensource-src (5.15.4+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop patches that are included in the new release:
+    - fix-invalid-pointer-return-with-QGridLayout.diff
+    - gcc-11-qtconcurrentthreadengine.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 May 2022 23:59:17 +0300
 
diff --git a/debian/patches/fix-invalid-pointer-return-with-QGridLayout.diff b/debian/patches/fix-invalid-pointer-return-with-QGridLayout.diff
deleted file mode 100644
index 9eac33d..0000000
--- a/debian/patches/fix-invalid-pointer-return-with-QGridLayout.diff
+++ /dev/null
@@ -1,113 +0,0 @@
-From c47bb4478a4c3a29c0505d7d89755f40601b326f Mon Sep 17 00:00:00 2001
-From: Zhang Yu <zhangyub at uniontech.com>
-Date: Mon, 22 Feb 2021 09:25:01 +0800
-Subject: [PATCH] Fix invalid pointer return with QGridLayout::itemAt(-1)
-
-QGridLayout::takeAt() and QLayoutItem *itemAt() only check the upper bound.
-If the index < 0, these function will return invalid pointer.
-
-Fixes: QTBUG-91261
-Pick-to: 5.15 6.0 6.1
-Change-Id: Idfb9fb6228b9707f817353b04974da16205a835c
-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo at kdab.com>
----
-
-diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp
-index 121bae0..336a68c 100644
---- a/src/widgets/kernel/qgridlayout.cpp
-+++ b/src/widgets/kernel/qgridlayout.cpp
-@@ -149,14 +149,14 @@
-     QRect cellRect(int row, int col) const;
- 
-     inline QLayoutItem *itemAt(int index) const {
--        if (index < things.count())
-+        if (index >= 0 && index < things.count())
-             return things.at(index)->item();
-         else
-             return nullptr;
-     }
-     inline QLayoutItem *takeAt(int index) {
-         Q_Q(QGridLayout);
--        if (index < things.count()) {
-+        if (index >= 0 && index < things.count()) {
-             if (QGridBox *b = things.takeAt(index)) {
-                 QLayoutItem *item = b->takeItem();
-                 if (QLayout *l = item->layout()) {
-@@ -184,7 +184,7 @@
-     }
- 
-     void getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) const {
--        if (index < things.count()) {
-+        if (index >= 0 && index < things.count()) {
-             const QGridBox *b =  things.at(index);
-             int toRow = b->toRow(rr);
-             int toCol = b->toCol(cc);
-diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
-index e3bd1d1..2cf2462 100644
---- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
-+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
-@@ -75,6 +75,7 @@
-     void taskQTBUG_40609_addingWidgetToItsOwnLayout();
-     void taskQTBUG_40609_addingLayoutToItself();
-     void taskQTBUG_52357_spacingWhenItemIsHidden();
-+    void taskQTBUG_91261_itemIndexRange();
-     void replaceWidget();
-     void dontCrashWhenExtendsToEnd();
- };
-@@ -1666,6 +1667,56 @@
-     QTRY_COMPARE_WITH_TIMEOUT(tempWidth, button1.width() + button3.width() + layout.spacing(), 1000);
- }
- 
-+void tst_QGridLayout::taskQTBUG_91261_itemIndexRange()
-+{
-+    QWidget widget;
-+    QGridLayout lay(&widget);
-+    QPushButton *btn = new QPushButton(&widget);
-+    lay.addWidget(btn, 0, 0);
-+
-+    {
-+        auto ptr = lay.itemAt(-1);
-+        QCOMPARE(ptr, nullptr);
-+
-+        ptr = lay.itemAt(0);
-+        QCOMPARE(ptr->widget(), btn);
-+
-+        ptr = lay.itemAt(1);
-+        QCOMPARE(ptr, nullptr);
-+    }
-+
-+    {
-+        int row = -1;
-+        int column = -1;
-+        int rowSpan;
-+        int columnSpan;
-+
-+        lay.getItemPosition(-1, &row, &column, &rowSpan, &columnSpan);
-+        QCOMPARE(row, -1);
-+        QCOMPARE(column, -1);
-+
-+        lay.getItemPosition(1, &row, &column, &rowSpan, &columnSpan);
-+        QCOMPARE(row, -1);
-+        QCOMPARE(column, -1);
-+
-+        lay.getItemPosition(0, &row, &column, &rowSpan, &columnSpan);
-+        QCOMPARE(row, 0);
-+        QCOMPARE(column, 0);
-+    }
-+
-+    {
-+        auto ptr = lay.takeAt(-1);
-+        QCOMPARE(ptr, nullptr);
-+
-+        ptr = lay.takeAt(1);
-+        QCOMPARE(ptr, nullptr);
-+
-+        ptr = lay.takeAt(0);
-+        QCOMPARE(ptr->widget(), btn);
-+        delete ptr;
-+    }
-+}
-+
- void tst_QGridLayout::replaceWidget()
- {
-     QWidget wdg;
diff --git a/debian/patches/gcc-11-qtconcurrentthreadengine.diff b/debian/patches/gcc-11-qtconcurrentthreadengine.diff
deleted file mode 100644
index 8cdeb07..0000000
--- a/debian/patches/gcc-11-qtconcurrentthreadengine.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix builds of qtconcurrentthreadengine.h with GCC 11
- Without this patch, all the code that #includes QtConcurrent headers
- will fail to compile with GCC 11.
-Origin: upstream, https://codereview.qt-project.org/c/qt/qtbase/+/339417
-Last-Update: 2022-04-01
-
---- a/src/concurrent/qtconcurrentthreadengine.h
-+++ b/src/concurrent/qtconcurrentthreadengine.h
-@@ -247,8 +247,8 @@ template <>
- class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
- {
- public:
--    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
--    :ThreadEngineStarterBase<void>(_threadEngine) {}
-+    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
-+        : ThreadEngineStarterBase<void>(_threadEngine) {}
- 
-     void startBlocking()
-     {
diff --git a/debian/patches/series b/debian/patches/series
index bb8030b..9d2fc3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # Backported from upstream.
 gcc_11_limits.diff
 mime_globs.diff
-fix-invalid-pointer-return-with-QGridLayout.diff
 fix-misplacement-of-placeholder-text-in-QLineEdit.diff
 fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
 fusion_checkable_qpushbutton.diff
@@ -13,7 +12,6 @@ mysql_field_readonly.diff
 CVE-2021-38593.diff
 openssl3.diff
 CVE-2022-25255.diff
-gcc-11-qtconcurrentthreadengine.diff
 moc_handle_include.diff
 
 # Debian specific.



More information about the Neon-commits mailing list