[neon/qt/qtdeclarative/Neon/release] debian/patches: merge from debian salsa and remove patches already in kde branch

[Jonathan Esk-Riddell]

Git commit c2545fd010b46012fd30f466ac684a582d0212e0 by Jonathan Esk-Riddell.
Committed on 05/05/2022 at 10:48.
Pushed by jriddell into branch 'Neon/release'.

merge from debian salsa and remove patches already in kde branch

M  +22   -22   debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
M  +0    -3    debian/patches/series

https://invent.kde.org/neon/qt/qtdeclarative/commit/c2545fd010b46012fd30f466ac684a582d0212e0

diff --git a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
index c0df07a..bece4cb 100644
--- a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
+++ b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
@@ -22,10 +22,10 @@ Pick-to: 5.15
 Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb
 ---
 
-Index: qtdeclarative-everywhere-src-5.15.1/src/quick/items/qquickitemview.cpp
+Index: qtdeclarative/src/quick/items/qquickitemview.cpp
 ===================================================================
---- qtdeclarative-everywhere-src-5.15.1.orig/src/quick/items/qquickitemview.cpp
-+++ qtdeclarative-everywhere-src-5.15.1/src/quick/items/qquickitemview.cpp
+--- qtdeclarative.orig/src/quick/items/qquickitemview.cpp
++++ qtdeclarative/src/quick/items/qquickitemview.cpp
 @@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
  {
      Q_D(const QQuickItemView);
@@ -44,10 +44,10 @@ Index: qtdeclarative-everywhere-src-5.15.1/src/quick/items/qquickitemview.cpp
  
      if (d->hData.maxExtentDirty) {
          d->maxExtent = d->maxExtentForAxis(d->hData, true);
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+Index: qtdeclarative/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
 ===================================================================
---- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+--- qtdeclarative.orig/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
++++ qtdeclarative/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
 @@ -73,6 +73,8 @@ public:
      tst_QQuickListView();
  
@@ -57,16 +57,16 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_q
      void init();
      void cleanupTestCase();
      // Test QAbstractItemModel model types
-@@ -298,6 +300,8 @@ private slots:
- 
-     void requiredObjectListModel();
+@@ -300,6 +302,8 @@ private slots:
+     void clickHeaderAndFooterWhenClip();
+     void animatedDelegate();
  
 +    // WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
 +
  private:
      template <class T> void items(const QUrl &source);
      template <class T> void changed(const QUrl &source);
-@@ -10067,6 +10071,8 @@ void tst_QQuickListView::requiredObjectL
+@@ -10109,6 +10113,8 @@ void tst_QQuickListView::animatedDelegat
      }
  }
  
@@ -75,10 +75,10 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_q
  QTEST_MAIN(tst_QQuickListView)
  
  #include "tst_qquicklistview.moc"
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
+Index: qtdeclarative/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
 ===================================================================
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
++++ qtdeclarative/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
 @@ -0,0 +1,54 @@
 +/****************************************************************************
 +**
@@ -134,10 +134,10 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data
 +        }
 +    }
 +}
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
+Index: qtdeclarative/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
 ===================================================================
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
++++ qtdeclarative/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
 @@ -0,0 +1,55 @@
 +/****************************************************************************
 +**
@@ -194,10 +194,10 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data
 +        }
 +    }
 +}
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/qquicklistview2.pro
+Index: qtdeclarative/tests/auto/quick/qquicklistview2/qquicklistview2.pro
 ===================================================================
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/qquicklistview2.pro
++++ qtdeclarative/tests/auto/quick/qquicklistview2/qquicklistview2.pro
 @@ -0,0 +1,12 @@
 +CONFIG += testcase
 +TARGET = tst_qquicklistview2
@@ -211,10 +211,10 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/qqui
 +TESTDATA = data/*
 +
 +QT += core-private gui-private qml-private quick-private testlib qmltest
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
+Index: qtdeclarative/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
 ===================================================================
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
++++ qtdeclarative/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
 @@ -0,0 +1,114 @@
 +/****************************************************************************
 +**
@@ -330,11 +330,11 @@ Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/tst_
 +QTEST_MAIN(tst_QQuickListView2)
 +
 +#include "tst_qquicklistview2.moc"
-Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
+Index: qtdeclarative/tests/auto/quick/quick.pro
 ===================================================================
---- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/quick/quick.pro
-+++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
-@@ -64,6 +64,7 @@ QUICKTESTS += \
+--- qtdeclarative.orig/tests/auto/quick/quick.pro
++++ qtdeclarative/tests/auto/quick/quick.pro
+@@ -65,6 +65,7 @@ QUICKTESTS += \
      qquickitem2 \
      qquickitemlayer \
      qquicklistview \
diff --git a/debian/patches/series b/debian/patches/series
index ea36b4b..f3a9f6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
 # Backported patches
-gcc_11.patch
 tst_qmldiskcache_big_endian.patch
-support_apos_in_styled_text.patch
-fix_sweep_step.patch
 
 # Debian patches
 disableopengltests.patch