kf5-kio runs wrong kioslave binary (#1512418)
This commit is contained in:
parent
c3e2657e0f
commit
400302d5ed
11
kf5-kio.spec
11
kf5-kio.spec
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: kf5-%{framework}
|
Name: kf5-%{framework}
|
||||||
Version: 5.40.0
|
Version: 5.40.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
|
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
|
||||||
|
|
||||||
License: GPLv2+ and MIT and BSD
|
License: GPLv2+ and MIT and BSD
|
||||||
|
@ -19,6 +19,12 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}
|
||||||
|
|
||||||
## upstream patches (lookaside cache)
|
## 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
|
# filter plugin provides
|
||||||
%global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$
|
%global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$
|
||||||
|
|
||||||
|
@ -265,6 +271,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Nov 10 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.40.0-1
|
||||||
- 5.40.0
|
- 5.40.0
|
||||||
|
|
||||||
|
|
|
@ -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);
|
Loading…
Reference in New Issue