[neon/kde/kio/Neon/release] debian/patches: update path

[Jonathan Esk-Riddell]

Git commit eadaa3e75b419ef7fa76ea630aae7b006eda6494 by Jonathan Esk-Riddell.
Committed on 14/02/2022 at 15:31.
Pushed by jriddell into branch 'Neon/release'.

update path

M  +10   -11   debian/patches/libexec_from_env.patch

https://invent.kde.org/neon/kde/kio/commit/eadaa3e75b419ef7fa76ea630aae7b006eda6494

diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index 4a8e6cc..148fc1a 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -9,33 +9,32 @@ original author: d_ed
  src/core/slave.cpp | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
 
-Index: kio/src/core/slave.cpp
+Index: kio-5.91.0/src/core/slave.cpp
 ===================================================================
---- kio.orig/src/core/slave.cpp
-+++ kio/src/core/slave.cpp
+--- kio-5.91.0.orig/src/core/slave.cpp
++++ kio-5.91.0/src/core/slave.cpp
 @@ -21,6 +21,7 @@
  #include <QProcess>
  #include <QStandardPaths>
  #include <QTimer>
 +#include <QTextCodec>
  
+ #include <KLibexec>
  #include <KLocalizedString>
- 
-@@ -437,9 +438,14 @@ Slave *Slave::createSlave(const QString
-     const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
- 
+@@ -435,6 +436,16 @@ Slave *Slave::createSlave(const QString
      // search paths
--    const QStringList searchPaths = QStringList() << QCoreApplication::applicationDirPath() // then look where our application binary is located
--                                                  << qlibexec << qlibexecKF5
--                                                  << QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF); // look at our installation location
+     QStringList searchPaths = KLibexec::kdeFrameworksPaths(QStringLiteral("libexec/kf5"));
+     searchPaths.append(QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF)); // look at our installation location
++
 +    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
++    searchPaths << KLibexec::kdeFrameworksPaths(QStringLiteral("libexec/kf5")); // then look where our application binary is located
 +    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