[neon/kde/kcoreaddons/Neon/unstable] debian/patches: refresh patches

[Jonathan Esk-Riddell]

Git commit cd5e43cc1ebcf02e775c40c14a7fe6f1342fa8fb by Jonathan Esk-Riddell.
Committed on 16/02/2022 at 17:33.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches

M  +2    -2    debian/patches/fix-kformattest-plural-forms.patch
M  +1    -13   debian/patches/kdirwatch-tests-method-specific.patch

https://invent.kde.org/neon/kde/kcoreaddons/commit/cd5e43cc1ebcf02e775c40c14a7fe6f1342fa8fb

diff --git a/debian/patches/fix-kformattest-plural-forms.patch b/debian/patches/fix-kformattest-plural-forms.patch
index e9663da..dece4f0 100644
--- a/debian/patches/fix-kformattest-plural-forms.patch
+++ b/debian/patches/fix-kformattest-plural-forms.patch
@@ -10,7 +10,7 @@ Index: kcoreaddons/autotests/kformattest.cpp
 ===================================================================
 --- kcoreaddons.orig/autotests/kformattest.cpp
 +++ kcoreaddons/autotests/kformattest.cpp
-@@ -290,8 +290,8 @@ void KFormatTest::formatDecimalDuration(
+@@ -279,8 +279,8 @@ void KFormatTest::formatDecimalDuration(
  {
      KFormat format(QLocale::c());
  
@@ -21,7 +21,7 @@ Index: kcoreaddons/autotests/kformattest.cpp
      QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds"));
      QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds"));
      QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes"));
-@@ -306,22 +306,22 @@ void KFormatTest::formatSpelloutDuration
+@@ -295,22 +295,22 @@ void KFormatTest::formatSpelloutDuration
  {
      KFormat format(QLocale::c());
  
diff --git a/debian/patches/kdirwatch-tests-method-specific.patch b/debian/patches/kdirwatch-tests-method-specific.patch
index 6fa10f2..6e17d92 100644
--- a/debian/patches/kdirwatch-tests-method-specific.patch
+++ b/debian/patches/kdirwatch-tests-method-specific.patch
@@ -11,7 +11,7 @@ Index: kcoreaddons/autotests/kdirwatch_unittest.cpp
 ===================================================================
 --- kcoreaddons.orig/autotests/kdirwatch_unittest.cpp
 +++ kcoreaddons/autotests/kdirwatch_unittest.cpp
-@@ -733,6 +733,10 @@ void KDirWatch_UnitTest::testHardlinkCha
+@@ -636,6 +636,10 @@ void KDirWatch_UnitTest::testHardlinkCha
      // We won't detect the change then, if we use that as baseline for waiting.
      // We really need msec granularity, but that requires using statx which isn't available everywhere...
      waitUntilNewSecond();
@@ -22,15 +22,3 @@ Index: kcoreaddons/autotests/kdirwatch_unittest.cpp
      appendToFile(existingFile);
      QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), existingFile));
  #else
-@@ -836,6 +840,11 @@ void KDirWatch_UnitTest::benchNotifyWatc
-     KDirWatch watch;
-     watch.addDir(dir.path(), KDirWatch::WatchSubDirs | KDirWatch:: WatchFiles);
- 
-+    auto method = qgetenv("KDIRWATCH_METHOD");
-+    if ((method != "INotify") && (method != "QFSWatch")) {
-+        QSKIP("Only works with the inotify and qfswatch backends", SkipSingle);
-+    }
-+
-     // now touch all the files repeatedly and wait for the dirty updates to come in
-     QSignalSpy spy(&watch, &KDirWatch::dirty);
-     QBENCHMARK {