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

Jonathan Riddell null at kde.org
Wed Feb 24 17:31:07 GMT 2021


Git commit f3dc3e132913653ee06fdc4c25712b3ba98e4e62 by Jonathan Riddell.
Committed on 24/02/2021 at 17:31.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patch

M  +7    -4    debian/patches/libexec_from_env.patch

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

diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
index a52c65b..508b51d 100644
--- a/debian/patches/libexec_from_env.patch
+++ b/debian/patches/libexec_from_env.patch
@@ -13,18 +13,21 @@ Index: kio/src/core/slave.cpp
 ===================================================================
 --- kio.orig/src/core/slave.cpp
 +++ kio/src/core/slave.cpp
-@@ -493,7 +493,13 @@ Slave *Slave::createSlave(const QString
+@@ -493,9 +493,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
 +        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(KDE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
++        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
          QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);
+         if (kioslaveExecutable.isEmpty()) {
+             // Fallback to PATH. On win32 we install to bin/ which tests outside


More information about the Neon-commits mailing list