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

[Jonathan Riddell]

Git commit 53806e61058397eaf412e1bed9aba1db06a2a5d5 by Jonathan Riddell.
Committed on 18/01/2022 at 16:13.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches

M  +4    -4    debian/patches/libexec_from_env.patch
M  +2    -2    debian/patches/report_error_removing_dirs

https://invent.kde.org/neon/kde/kio/commit/53806e61058397eaf412e1bed9aba1db06a2a5d5

diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index 4ffcfdb..4a8e6cc 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -13,7 +13,7 @@ Index: kio/src/core/slave.cpp
 ===================================================================
 --- kio.orig/src/core/slave.cpp
 +++ kio/src/core/slave.cpp
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
  #include <QProcess>
  #include <QStandardPaths>
  #include <QTimer>
@@ -21,13 +21,13 @@ Index: kio/src/core/slave.cpp
  
  #include <KLocalizedString>
  
-@@ -438,9 +439,14 @@ Slave *Slave::createSlave(const QString
+@@ -437,9 +438,14 @@ 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
 -                                                  << qlibexec << qlibexecKF5
--                                                  << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
+-                                                  << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF); // look at our installation location
 +    QStringList searchPaths = QStringList();
 +
 +    if (qEnvironmentVariableIsSet("KF5_LIBEXEC_DIR")) {
@@ -35,7 +35,7 @@ Index: kio/src/core/slave.cpp
 +    }
 +
 +    searchPaths << QCoreApplication::applicationDirPath(); // then look where our application binary is located
-+    searchPaths << qlibexec << qlibexecKF5 << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
++    searchPaths << qlibexec << qlibexecKF5 << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF); // look at our installation location
      QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);
      if (kioslaveExecutable.isEmpty()) {
          // Fallback to PATH. On win32 we install to bin/ which tests outside
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index f09c1c4..32fa3df 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -28,7 +28,7 @@ Index: kio/src/core/copyjob.cpp
  
      QTimer *m_reportTimer;
  
-@@ -2185,6 +2188,10 @@ void CopyJobPrivate::setNextDirAttribute
+@@ -2183,6 +2186,10 @@ void CopyJobPrivate::setNextDirAttribute
              m_reportTimer->stop();
          }
  
@@ -39,7 +39,7 @@ Index: kio/src/core/copyjob.cpp
          q->emitResult();
      }
  }
-@@ -2256,12 +2263,14 @@ void CopyJobPrivate::slotTotalSize(KJob
+@@ -2254,12 +2261,14 @@ void CopyJobPrivate::slotTotalSize(KJob
  void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
  {
      Q_Q(CopyJob);