[neon/qt/qtdeclarative/Neon/release] debian: Refresh other patches.

[Dmitry Shachnev]

Git commit 5224e29814fff0384bf2a183f8829617ff59643e by Dmitry Shachnev.
Committed on 03/03/2022 at 19:41.
Pushed by jriddell into branch 'Neon/release'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/fix_test_remove_qlibraryinfo.patch
M  +1    -5    debian/patches/support_apos_in_styled_text.patch
M  +1    -1    debian/patches/tst_qmldiskcache_big_endian.patch

https://invent.kde.org/neon/qt/qtdeclarative/commit/5224e29814fff0384bf2a183f8829617ff59643e

diff --git a/debian/changelog b/debian/changelog
index c9e9d7a..ed871dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtdeclarative-opensource-src (5.15.3+dfsg-1) UNRELEASED; urgency=medium
   * Drop patches that are included in the new release:
     - qmltime-tool.patch
     - fix_qml_property_cache_leaks.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Mar 2022 22:30:20 +0300
 
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index 4185d52..b2f4c2f 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -120,7 +120,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      void checkJsHeap();
 --- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
 +++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
-@@ -106,7 +106,7 @@ static bool generateCache(const QString
+@@ -107,7 +107,7 @@ static bool generateCache(const QString
      QProcess proc;
      if (capturedStderr == nullptr)
          proc.setProcessChannelMode(QProcess::ForwardedChannels);
@@ -236,7 +236,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
 +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
-@@ -9248,7 +9248,7 @@ void tst_qqmlecmascript::hugeStack()
+@@ -9249,7 +9249,7 @@ void tst_qqmlecmascript::hugeStack()
  
  void tst_qqmlecmascript::gcCrashRegressionTest()
  {
diff --git a/debian/patches/support_apos_in_styled_text.patch b/debian/patches/support_apos_in_styled_text.patch
index 83225cf..af8a0c6 100644
--- a/debian/patches/support_apos_in_styled_text.patch
+++ b/debian/patches/support_apos_in_styled_text.patch
@@ -5,8 +5,6 @@ Forwarded: not-needed
 Author: Albert Astals Cid
 Applied-Upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f
 
-diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
-index 581ab9f76a41b731126eb53aa7069a21d7c96c76..4ddd2a41bc9290d09412b7904c3561ccfb65a6a8 100644
 --- a/src/quick/items/qquicktext.cpp
 +++ b/src/quick/items/qquicktext.cpp
 @@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
@@ -18,11 +16,9 @@ index 581ab9f76a41b731126eb53aa7069a21d7c96c76..4ddd2a41bc9290d09412b7904c3561cc
      \endcode
  
      \c Text.StyledText parser is strict, requiring tags to be correctly nested.
-diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
-index d531fc92051b4a966a29ea4c463c7d5ca79a7ab3..a25af90414bc4e29efe02c773bf19645a272b93c 100644
 --- a/src/quick/util/qquickstyledtext.cpp
 +++ b/src/quick/util/qquickstyledtext.cpp
-@@ -564,6 +564,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
+@@ -562,6 +562,8 @@ void QQuickStyledTextPrivate::parseEntit
                  textOut += QChar(60);
              else if (entity == QLatin1String("amp"))
                  textOut += QChar(38);
diff --git a/debian/patches/tst_qmldiskcache_big_endian.patch b/debian/patches/tst_qmldiskcache_big_endian.patch
index 8a5907e..b47043b 100644
--- a/debian/patches/tst_qmldiskcache_big_endian.patch
+++ b/debian/patches/tst_qmldiskcache_big_endian.patch
@@ -4,7 +4,7 @@ Last-Update: 2021-02-11
 
 --- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
 +++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
-@@ -332,9 +332,8 @@ void tst_qmldiskcache::regenerateAfterCh
+@@ -376,9 +376,8 @@ void tst_qmldiskcache::regenerateAfterCh
          QCOMPARE(quint32(obj->nBindings), quint32(2));
          QCOMPARE(quint32(obj->bindingTable()->type), quint32(QV4::CompiledData::Binding::Type_Number));