[neon/kde/kio/Neon/release] debian/patches: remove patch for snaps no longer needed as new code uses relative paths

Jonathan Esk-Riddell null at kde.org
Mon Feb 14 16:10:10 GMT 2022


Git commit 7037a72a33a182dac51b2bb2c1e54761afea4b40 by Jonathan Esk-Riddell.
Committed on 14/02/2022 at 16:10.
Pushed by jriddell into branch 'Neon/release'.

remove patch for snaps no longer needed as new code uses relative paths

D  +0    -40   debian/patches/libexec_from_env.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/kio/commit/7037a72a33a182dac51b2bb2c1e54761afea4b40

diff --git a/debian/patches/libexec_from_env.patch b/debian/patches/libexec_from_env.patch
deleted file mode 100644
index 148fc1a..0000000
--- a/debian/patches/libexec_from_env.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a533c8f63be9d36a01dc9eec4186e5be3f518d03 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter at kde.org>
-Date: Thu, 21 Feb 2019 11:19:42 +0100
-Subject: [PATCH] This is used by Snap packages which get mounted at an
- unpredictable location at runtime
-
-original author: d_ed
----
- src/core/slave.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-Index: kio-5.91.0/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>
-@@ -435,6 +436,16 @@ Slave *Slave::createSlave(const QString
-     // search paths
-     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 << 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
diff --git a/debian/patches/series b/debian/patches/series
index 61b000d..0e4fb57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ wait_for_a_bit_longer
 Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
-libexec_from_env.patch


More information about the Neon-commits mailing list