From 51cdf4fdea70543d22bf484ac5bb0cb63924beb4 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 30 Aug 2020 23:04:50 +1200 Subject: [PATCH] kdesu: update patch to use qCWarning --- .../kdesu/kdesu-search-for-wrapped-daemon-first.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index ffc7edadfab..f82bf828e8e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644 - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { -- qWarning() << "kdesud daemon not found."; +- qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers + daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { -+ qWarning() << "kdesud daemon not found."; ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; + } } }