From 400302d5eda11c7f5f99ee4aaf37f62751411d25 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mon, 13 Nov 2017 10:06:28 -0600
Subject: [PATCH] kf5-kio runs wrong kioslave binary (#1512418)

---
 kf5-kio.spec         | 11 ++++++++++-
 kio-slave_path.patch | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 kio-slave_path.patch

diff --git a/kf5-kio.spec b/kf5-kio.spec
index cd1aff6..aaa4519 100644
--- a/kf5-kio.spec
+++ b/kf5-kio.spec
@@ -2,7 +2,7 @@
 
 Name:    kf5-%{framework}
 Version: 5.40.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
 
 License: GPLv2+ and MIT and BSD
@@ -19,6 +19,12 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}
 
 ## upstream patches (lookaside cache)
 
+## upstreamable patches
+# revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b
+# can cause kio to try to use 'kioslave' binary from kdelibs3,
+# https://bugzilla.redhat.com/show_bug.cgi?id=1512418#c16
+Patch100: kio-slave_path.patch
+
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$
 
@@ -265,6 +271,9 @@ fi
 
 
 %changelog
+* Mon Nov 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.40.0-2
+- kf5-kio runs wrong kioslave binary (#1512418)
+
 * Fri Nov 10 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.40.0-1
 - 5.40.0
 
diff --git a/kio-slave_path.patch b/kio-slave_path.patch
new file mode 100644
index 0000000..fafdc16
--- /dev/null
+++ b/kio-slave_path.patch
@@ -0,0 +1,11 @@
+diff -up kio-5.40.0/src/core/slave.cpp.path kio-5.40.0/src/core/slave.cpp
+--- kio-5.40.0/src/core/slave.cpp.path	2017-11-05 02:33:04.000000000 -0600
++++ kio-5.40.0/src/core/slave.cpp	2017-11-13 10:04:14.921095694 -0600
+@@ -504,7 +504,6 @@ Slave *Slave::createSlave(const QString
+ 
+         // search paths
+         const QStringList searchPaths = QStringList()
+-            << QCoreApplication::applicationDirPath() // then look where our application binary is located
+             << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) // look where libexec path is (can be set in qt.conf)
+             << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location
+         const QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave"), searchPaths);