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

[Jonathan Riddell]

Git commit 2cc23d061735c10ee5da6b0a2d3f93d480a5caf0 by Jonathan Riddell.
Committed on 24/02/2021 at 16:24.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches

M  +2    -2    debian/patches/Disable-baloo-dependant-tests.patch
M  +5    -3    debian/patches/Disable-flaky-test.patch
M  +4    -4    debian/patches/fix_hurd_build.patch
M  +6    -6    debian/patches/fix_kfreebsd_build
M  +6    -7    debian/patches/libexec_from_env.patch

https://invent.kde.org/neon/kde/kio/commit/2cc23d061735c10ee5da6b0a2d3f93d480a5caf0

diff --git a/debian/patches/Disable-baloo-dependant-tests.patch b/debian/patches/Disable-baloo-dependant-tests.patch
index bc40bf5..bb9c584 100644
--- a/debian/patches/Disable-baloo-dependant-tests.patch
+++ b/debian/patches/Disable-baloo-dependant-tests.patch
@@ -10,8 +10,8 @@ Index: kio/autotests/kfileplacesviewtest.cpp
 ===================================================================
 --- kio.orig/autotests/kfileplacesviewtest.cpp
 +++ kio/autotests/kfileplacesviewtest.cpp
-@@ -114,7 +114,7 @@ void KFilePlacesViewTest::testUrlChanged
-     pv.clicked(targetIndex);
+@@ -104,7 +104,7 @@ void KFilePlacesViewTest::testUrlChanged
+     Q_EMIT pv.clicked(targetIndex);
      QTRY_COMPARE(urlChangedSpy.count(), 1);
      const QList<QVariant> args = urlChangedSpy.takeFirst();
 -    QCOMPARE(args.at(0).toUrl().toString(), expectedUrl);
diff --git a/debian/patches/Disable-flaky-test.patch b/debian/patches/Disable-flaky-test.patch
index 38e9b2d..55883db 100644
--- a/debian/patches/Disable-flaky-test.patch
+++ b/debian/patches/Disable-flaky-test.patch
@@ -6,9 +6,11 @@ Subject: Disable flaky test
  autotests/kdirlistertest.cpp | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
---- a/autotests/kdirlistertest.cpp
-+++ b/autotests/kdirlistertest.cpp
-@@ -1205,12 +1205,12 @@
+Index: kio/autotests/kdirlistertest.cpp
+===================================================================
+--- kio.orig/autotests/kdirlistertest.cpp
++++ kio/autotests/kdirlistertest.cpp
+@@ -1312,12 +1312,12 @@ void KDirListerTest::testRemoveWatchedDi
      QVERIFY(QDir().rmdir(path + "abc"));
  
      // This should trigger an update.
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 1fb185e..d2c39ee 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -16,20 +16,20 @@ Index: kio/src/ioslaves/file/file.cpp
 ===================================================================
 --- kio.orig/src/ioslaves/file/file.cpp
 +++ kio/src/ioslaves/file/file.cpp
-@@ -392,7 +392,7 @@ void FileProtocol::get(const QUrl &url)
+@@ -308,7 +308,7 @@ void FileProtocol::get(const QUrl &url)
          }
      }
  
 -#if HAVE_FADVISE
 +#if HAVE_FADVISE && !defined(__GNU__)
-     //TODO check return code
+     // TODO check return code
      posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
 Index: kio/src/ioslaves/file/file_unix.cpp
 ===================================================================
 --- kio.orig/src/ioslaves/file/file_unix.cpp
 +++ kio/src/ioslaves/file/file_unix.cpp
-@@ -216,7 +216,7 @@ void FileProtocol::copy(const QUrl &srcU
+@@ -773,7 +773,7 @@ void FileProtocol::copy(const QUrl &srcU
          }
      }
  
@@ -38,7 +38,7 @@ Index: kio/src/ioslaves/file/file_unix.cpp
      posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
  
-@@ -240,7 +240,7 @@ void FileProtocol::copy(const QUrl &srcU
+@@ -797,7 +797,7 @@ void FileProtocol::copy(const QUrl &srcU
      // Note that error handling is omitted for this call, we don't want to error on e.g. VFAT
      dest_file.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner);
  
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index dd6d884..3831ed8 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -11,18 +11,18 @@ Index: kio/src/widgets/kpropertiesdialog.cpp
 ===================================================================
 --- kio.orig/src/widgets/kpropertiesdialog.cpp
 +++ kio/src/widgets/kpropertiesdialog.cpp
-@@ -82,6 +82,10 @@
+@@ -69,6 +69,10 @@
  extern "C" {
- #  include <errno.h>
- #  include <sys/xattr.h>
-+#  if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
+ #include <errno.h>
+ #include <sys/xattr.h>
++#if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
 +#     include <sys/vfs.h>
 +#     include <sys/mount.h>
-+#  endif
++#endif
  }
  #endif
  
-@@ -1985,7 +1989,7 @@ KFilePermissionsPropsPlugin::KFilePermis
+@@ -2017,7 +2021,7 @@ KFilePermissionsPropsPlugin::KFilePermis
  static bool fileSystemSupportsACL(const QByteArray &path)
  {
      bool fileSystemSupportsACLs = false;
diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index 37f7abe..a52c65b 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -13,19 +13,18 @@ Index: kio/src/core/slave.cpp
 ===================================================================
 --- kio.orig/src/core/slave.cpp
 +++ kio/src/core/slave.cpp
-@@ -516,8 +516,13 @@ Slave *Slave::createSlave(const QString
+@@ -493,7 +493,13 @@ Slave *Slave::createSlave(const QString
          const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
  
          // search paths
--        const QStringList searchPaths = QStringList()
--            << QCoreApplication::applicationDirPath() // then look where our application binary is located
-+        QStringList searchPaths = QStringList();
+-        const QStringList searchPaths = QStringList() << QCoreApplication::applicationDirPath() // then look where our application binary is located
++        const QStringList searchPaths = QStringList();
 +
 +        if (qEnvironmentVariableIsSet("KF5_LIBEXEC_DIR")) {
 +            searchPaths << QTextCodec::codecForLocale()->toUnicode(qgetenv("KF5_LIBEXEC_DIR"));
 +        }
 +
 +        searchPaths << QCoreApplication::applicationDirPath() // then look where our application binary is located
-             << qlibexec
-             << qlibexecKF5
-             << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
+                                                       << qlibexec << qlibexecKF5
+                                                       << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
+         QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);