public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdesu: update patch to use qCWarning

Browse Source
This commit is contained in:
Jamie McClymont 2020-08-30 23:04:50 +12:00 committed by Frederik Rietdijk
parent 1b7b1cb976
commit 51cdf4fdea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
View File

@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
- if (daemon.isEmpty()) { - if (daemon.isEmpty()) {
- qWarning() << "kdesud daemon not found."; - qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
+ if (!QFile::exists(daemon)) { // if not in wrappers + if (!QFile::exists(daemon)) { // if not in wrappers
+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
+ if (daemon.isEmpty()) { + if (daemon.isEmpty()) {
+ qWarning() << "kdesud daemon not found."; + qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ } + }
} }
} }