pyrox.dev
kde/kdesu: Fix patch to work with new kde framework
+3
-3
pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
+3
-3
pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
···
13
index 44fbacd..6b5abf5 100644
14
--- a/src/client.cpp
15
+++ b/src/client.cpp
16
-
@@ -378,11 +378,14 @@ int KDEsuClient::stopServer()
17
18
static QString findDaemon()
19
{
20
-
- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
21
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
22
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
23
- if (daemon.isEmpty()) {
24
- qCWarning(KSU_LOG) << "kdesud daemon not found.";
25
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
26
+ if (!QFile::exists(daemon)) { // if not in wrappers
27
-
+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
28
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
29
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
30
+ if (daemon.isEmpty()) {
···
13
index 44fbacd..6b5abf5 100644
14
--- a/src/client.cpp
15
+++ b/src/client.cpp
16
+
@@ -384,11 +384,14 @@ int KDEsuClient::stopServer()
17
18
static QString findDaemon()
19
{
20
+
- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud");
21
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
22
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
23
- if (daemon.isEmpty()) {
24
- qCWarning(KSU_LOG) << "kdesud daemon not found.";
25
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
26
+ if (!QFile::exists(daemon)) { // if not in wrappers
27
+
+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud");
28
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
29
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
30
+ if (daemon.isEmpty()) {