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

[Dmitry Shachnev]

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

Refresh other patches.

M  +1    -0    debian/changelog
M  +5    -5    debian/patches/CVE-2022-25255.diff
M  +1    -1    debian/patches/fix_recursion_crash.diff

https://invent.kde.org/neon/qt/qtbase/commit/3fd945476dd5233caa138019aab0cdab5ee137f5

diff --git a/debian/changelog b/debian/changelog
index 2cfe893..e42d836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.15.4+dfsg-1) UNRELEASED; urgency=medium
   * Drop patches that are included in the new release:
     - fix-invalid-pointer-return-with-QGridLayout.diff
     - gcc-11-qtconcurrentthreadengine.diff
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 May 2022 23:59:17 +0300
 
diff --git a/debian/patches/CVE-2022-25255.diff b/debian/patches/CVE-2022-25255.diff
index 1aec848..c9687c0 100644
--- a/debian/patches/CVE-2022-25255.diff
+++ b/debian/patches/CVE-2022-25255.diff
@@ -72,16 +72,16 @@ Last-Update: 2022-02-21
                  qt_safe_execve(argv[0], argv, envp);
 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
 +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
-@@ -1493,7 +1493,7 @@ void tst_QApplication::desktopSettingsAw
- {
- #if QT_CONFIG(process)
-     QProcess testProcess;
+@@ -1498,7 +1498,7 @@ void tst_QApplication::desktopSettingsAw
+     environment += QLatin1String("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM=1");
+     testProcess.setEnvironment(environment);
+ #endif
 -    testProcess.start("desktopsettingsaware_helper");
 +    testProcess.start("./desktopsettingsaware_helper");
      QVERIFY2(testProcess.waitForStarted(),
               qPrintable(QString::fromLatin1("Cannot start 'desktopsettingsaware_helper': %1").arg(testProcess.errorString())));
      QVERIFY(testProcess.waitForFinished(10000));
-@@ -2447,7 +2447,7 @@ void tst_QApplication::qtbug_12673()
+@@ -2452,7 +2452,7 @@ void tst_QApplication::qtbug_12673()
  #if QT_CONFIG(process)
      QProcess testProcess;
      QStringList arguments;
diff --git a/debian/patches/fix_recursion_crash.diff b/debian/patches/fix_recursion_crash.diff
index 18667ac..6ee2ebe 100644
--- a/debian/patches/fix_recursion_crash.diff
+++ b/debian/patches/fix_recursion_crash.diff
@@ -10,7 +10,7 @@ Last-Update: 2021-11-13
 
 --- a/src/widgets/styles/qstylesheetstyle.cpp
 +++ b/src/widgets/styles/qstylesheetstyle.cpp
-@@ -2640,6 +2640,9 @@ void QStyleSheetStyle::setProperties(QWi
+@@ -2646,6 +2646,9 @@ void QStyleSheetStyle::setProperties(QWi
          default: v = decl.d->values.at(0).variant; break;
          }