Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kinfocenter5 for openSUSE:Factory
checked in at 2022-02-11 23:06:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kinfocenter5 (Old)
and /work/SRC/openSUSE:Factory/.kinfocenter5.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinfocenter5"
Fri Feb 11 23:06:58 2022 rev:136 rq:953127 version:5.24.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kinfocenter5/kinfocenter5.changes
2022-02-07 23:37:07.846833203 +0100
+++ /work/SRC/openSUSE:Factory/.kinfocenter5.new.1956/kinfocenter5.changes
2022-02-11 23:07:41.370652494 +0100
@@ -1,0 +2,17 @@
+Wed Feb 9 16:09:01 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Change patch to also search in /sbin:
+ * Add 0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch
+ * Drop 0001-Search-in-usr-local-sbin-usr-sbin-as-fallback.patch
+ * Rebase 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch
+
+-------------------------------------------------------------------
+Tue Feb 8 18:09:01 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- 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
+
+-------------------------------------------------------------------
New:
----
0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch
0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kinfocenter5.spec ++++++
--- /var/tmp/diff_new_pack.FlV4D8/_old 2022-02-11 23:07:42.310655104 +0100
+++ /var/tmp/diff_new_pack.FlV4D8/_new 2022-02-11 23:07:42.314655116 +0100
@@ -38,6 +38,10 @@
Source1: kinfocenter-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch
+# PATCH-FIX-OPENSUSE
+Patch100: 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: systemsettings5
BuildRequires: update-desktop-files
@@ -75,8 +79,11 @@
# Plasma Wayland and X11 sessions are always installed
Requires: /usr/bin/wayland-info
Requires: /usr/bin/xdpyinfo
-# Not packaged yet?
+# Note: Not available as /usr/bin/eglinfo yet (boo#1195695)
Recommends: /usr/bin/eglinfo
+# Mesa-demos includes it, but as a whole it's too fat,
+# so don't pull it in by default.
+Suggests: Mesa-demo
%description
KDE Utility that provides information about a computer system.
++++++ 0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch ++++++
>From da706d27bb4663e584725926ed144b6089bc6c3e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Tue, 8 Feb 2022 18:55:49 +0100
Subject: [PATCH 1/2] Search in /usr/local/sbin:/usr/sbin:/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 | 6 ++++++
src/CommandOutputContext.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/CommandOutputContext.cpp b/src/CommandOutputContext.cpp
index 4808b45..ec3cd3d 100644
--- a/src/CommandOutputContext.cpp
+++ b/src/CommandOutputContext.cpp
@@ -19,6 +19,12 @@ 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"),
QStringLiteral("/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
++++++ 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch ++++++
>From 63940ad9bb5eb3bd8c0eefcf20c4b14d68f9c5c2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Tue, 8 Feb 2022 19:06:23 +0100
Subject: [PATCH 2/2] Look for binaries in Mesa-demos path as well
eglinfo is not in $PATH (yet, boo#1195695)
---
src/CommandOutputContext.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/CommandOutputContext.cpp b/src/CommandOutputContext.cpp
index ec3cd3d..96e11ce 100644
--- a/src/CommandOutputContext.cpp
+++ b/src/CommandOutputContext.cpp
@@ -25,6 +25,13 @@ CommandOutputContext::CommandOutputContext(const QString
&executable, const QStr
QStandardPaths::findExecutable(m_executableName,
{QStringLiteral("/usr/local/sbin"), QStringLiteral("/usr/sbin"),
QStringLiteral("/sbin")});
}
+ // boo#1195695
+ if (m_executablePath.isEmpty()) {
+ m_executablePath =
+ QStandardPaths::findExecutable(m_executableName,
+
{QStringLiteral("/usr/lib64/mesa-demos/egl/opengl"),
QStringLiteral("/usr/lib/mesa-demos/egl/opengl")});
+ }
+
metaObject()->invokeMethod(this, &CommandOutputContext::load);
}
--
2.33.1
