forked from pool/kinfocenter5
0dd199e0c3
- Add patch to actually find lscpi (kde#449792, boo#1195696): * 0001-Search-in-usr-local-sbin-usr-sbin-as-fallback.patch - ... and eglinfo (boo1195695): * 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch - Suggest Mesa-demo for eglinfo OBS-URL: https://build.opensuse.org/request/show/952788 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=336
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From daf4d56177c1cdfeb22b975d38181d483dc6d3ae Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Date: Tue, 8 Feb 2022 18:55:49 +0100
|
|
Subject: [PATCH 1/2] Search in /usr/local/sbin:/usr/sbin as fallback
|
|
|
|
Utilities such as lspci default to /usr/(local/)sbin/ as install location,
|
|
but that's not in $PATH for regular user sessions. It still works without
|
|
supeuser privileges, so just look there as well as a fallback.
|
|
|
|
BUG: 449792
|
|
---
|
|
src/CommandOutputContext.cpp | 5 +++++
|
|
src/CommandOutputContext.h | 2 +-
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/CommandOutputContext.cpp b/src/CommandOutputContext.cpp
|
|
index 4808b45..30c33a9 100644
|
|
--- a/src/CommandOutputContext.cpp
|
|
+++ b/src/CommandOutputContext.cpp
|
|
@@ -19,6 +19,11 @@ CommandOutputContext::CommandOutputContext(const QString &executable, const QStr
|
|
, m_executablePath(QStandardPaths::findExecutable(m_executableName))
|
|
, m_arguments(arguments)
|
|
{
|
|
+ // Various utilities are installed in sbin, but work without elevated privileges
|
|
+ if (m_executablePath.isEmpty()) {
|
|
+ m_executablePath = QStandardPaths::findExecutable(m_executableName, {QStringLiteral("/usr/local/sbin"), QStringLiteral("/usr/sbin")});
|
|
+ }
|
|
+
|
|
metaObject()->invokeMethod(this, &CommandOutputContext::load);
|
|
}
|
|
|
|
diff --git a/src/CommandOutputContext.h b/src/CommandOutputContext.h
|
|
index 13fc528..c818b42 100644
|
|
--- a/src/CommandOutputContext.h
|
|
+++ b/src/CommandOutputContext.h
|
|
@@ -44,7 +44,7 @@ private:
|
|
void setReady();
|
|
|
|
const QString m_executableName;
|
|
- const QString m_executablePath;
|
|
+ QString m_executablePath;
|
|
const QStringList m_arguments;
|
|
|
|
QStringList m_originalLines;
|
|
--
|
|
2.33.1
|
|
|