commit 8784907685cc769de3607b6e7397c60308d4fe86fe932fe0d0d6e7b8cee90646 Author: Christophe Marin Date: Wed Oct 23 07:42:47 2024 +0000 Plasma 6.2.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kinfocenter6?expand=0&rev=36 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-kcms-pull-dmidecode-helper-into-a-separate-dir.patch b/0001-kcms-pull-dmidecode-helper-into-a-separate-dir.patch new file mode 100644 index 0000000..31a69fa --- /dev/null +++ b/0001-kcms-pull-dmidecode-helper-into-a-separate-dir.patch @@ -0,0 +1,73 @@ +From 582cbde53cfb9e79182663bfd7c86aa46c0b46eb Mon Sep 17 00:00:00 2001 +From: Kristen McWilliam +Date: Thu, 29 Aug 2024 15:20:54 -0400 +Subject: [PATCH 1/3] kcms: pull dmidecode-helper into a separate dir + +This allows us to reuse the helper in other +places, like the memory info kcm. +--- + kcms/CMakeLists.txt | 1 + + kcms/about-distro/src/CMakeLists.txt | 2 -- + kcms/helpers/CMakeLists.txt | 4 ++++ + .../src => helpers}/dmidecode-helper/CMakeLists.txt | 0 + .../{about-distro/src => helpers}/dmidecode-helper/helper.cpp | 0 + kcms/{about-distro/src => helpers}/dmidecode-helper/helper.h | 0 + .../dmidecode-helper/org.kde.kinfocenter.dmidecode.actions | 0 + 7 files changed, 5 insertions(+), 2 deletions(-) + create mode 100644 kcms/helpers/CMakeLists.txt + rename kcms/{about-distro/src => helpers}/dmidecode-helper/CMakeLists.txt (100%) + rename kcms/{about-distro/src => helpers}/dmidecode-helper/helper.cpp (100%) + rename kcms/{about-distro/src => helpers}/dmidecode-helper/helper.h (100%) + rename kcms/{about-distro/src => helpers}/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions (100%) + +diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt +index f283f477..ce534f40 100644 +--- a/kcms/CMakeLists.txt ++++ b/kcms/CMakeLists.txt +@@ -1,3 +1,4 @@ ++add_subdirectory(helpers) + + add_subdirectory( about-distro ) + add_subdirectory(vulkan) +diff --git a/kcms/about-distro/src/CMakeLists.txt b/kcms/about-distro/src/CMakeLists.txt +index fffb24d6..961ac959 100644 +--- a/kcms/about-distro/src/CMakeLists.txt ++++ b/kcms/about-distro/src/CMakeLists.txt +@@ -1,8 +1,6 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/Version.h) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +-add_subdirectory(dmidecode-helper) +- + set(kcm_SRCS + CPUEntry.cpp + CPUEntry.h +diff --git a/kcms/helpers/CMakeLists.txt b/kcms/helpers/CMakeLists.txt +new file mode 100644 +index 00000000..cbf024bd +--- /dev/null ++++ b/kcms/helpers/CMakeLists.txt +@@ -0,0 +1,4 @@ ++# SPDX-License-Identifier: BSD-3-Clause ++# SPDX-FileCopyrightText: 2024 Kristen McWilliam ++ ++add_subdirectory(dmidecode-helper) +diff --git a/kcms/about-distro/src/dmidecode-helper/CMakeLists.txt b/kcms/helpers/dmidecode-helper/CMakeLists.txt +similarity index 100% +rename from kcms/about-distro/src/dmidecode-helper/CMakeLists.txt +rename to kcms/helpers/dmidecode-helper/CMakeLists.txt +diff --git a/kcms/about-distro/src/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp +similarity index 100% +rename from kcms/about-distro/src/dmidecode-helper/helper.cpp +rename to kcms/helpers/dmidecode-helper/helper.cpp +diff --git a/kcms/about-distro/src/dmidecode-helper/helper.h b/kcms/helpers/dmidecode-helper/helper.h +similarity index 100% +rename from kcms/about-distro/src/dmidecode-helper/helper.h +rename to kcms/helpers/dmidecode-helper/helper.h +diff --git a/kcms/about-distro/src/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions b/kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions +similarity index 100% +rename from kcms/about-distro/src/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions +rename to kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions +-- +2.47.0 + diff --git a/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch b/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch new file mode 100644 index 0000000..7e97ebc --- /dev/null +++ b/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch @@ -0,0 +1,31 @@ +From 0836341c590dc14626e3e1856fb1917ba07fcb84 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 8 Feb 2022 19:06:23 +0100 +Subject: [PATCH] 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 dad54a5e..30554499 100644 +--- a/src/CommandOutputContext.cpp ++++ b/src/CommandOutputContext.cpp +@@ -27,6 +27,13 @@ CommandOutputContext::CommandOutputContext(const QStringList &findExecutables, c + 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")}); ++ } ++ + m_foundExecutablePaths[executable] = m_executablePath; + for (const QString &findExecutable : findExecutables) { + m_foundExecutablePaths[findExecutable] = QStandardPaths::findExecutable(findExecutable); +-- +2.36.1 + diff --git a/0002-refactor-dmidecode-helper-support-multiple-methods.patch b/0002-refactor-dmidecode-helper-support-multiple-methods.patch new file mode 100644 index 0000000..d0951ff --- /dev/null +++ b/0002-refactor-dmidecode-helper-support-multiple-methods.patch @@ -0,0 +1,150 @@ +From e6f449a1aa0bf5b1dceaff13390955bd3d21de9d Mon Sep 17 00:00:00 2001 +From: Kristen McWilliam +Date: Thu, 5 Sep 2024 13:03:45 -0400 +Subject: [PATCH 2/3] refactor(dmidecode-helper): support multiple methods + +This allows the helper to extend and support other +types of information, eg. memory information. +--- + kcms/helpers/dmidecode-helper/helper.cpp | 60 +++++++++++++++++------- + kcms/helpers/dmidecode-helper/helper.h | 15 ++++++ + 2 files changed, 58 insertions(+), 17 deletions(-) + +diff --git a/kcms/helpers/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp +index 396b2d74..e9d068dc 100644 +--- a/kcms/helpers/dmidecode-helper/helper.cpp ++++ b/kcms/helpers/dmidecode-helper/helper.cpp +@@ -1,5 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL + // SPDX-FileCopyrightText: 2021-2022 Harald Sitter ++// SPDX-FileCopyrightText: 2024 Kristen McWilliam + + #include "helper.h" + +@@ -16,16 +17,18 @@ auto make_array(Input &&...args) -> std::array // NB: w + return {std::forward(args)...}; + } + +-KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) ++DMIDecodeHelper::DMIDecodeHelper(QObject *parent) ++ : QObject(parent) + { +- Q_UNUSED(args); +- + // PATH is super minimal when invoked through dbus + setenv("PATH", "/usr/sbin:/sbin:/usr/local/sbin", 1); +- const QString dmidecode = QStandardPaths::findExecutable("dmidecode"); +- if (dmidecode.isEmpty()) { +- return KAuth::ActionReply::HelperErrorReply(); +- } ++ ++ m_dmidecodePath = QStandardPaths::findExecutable("dmidecode"); ++} ++ ++KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) ++{ ++ Q_UNUSED(args); + + // NB: Microsoft also outlines a limited set of DMI values to be required for IOT OEM licensing, as such we + // can rely on the same fields to have sound content . Since this only applies to OEMs we still need to filter +@@ -33,19 +36,20 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + // https://docs.microsoft.com/en-us/windows-hardware/manufacture/iot/license-requirements?view=windows-11#smbios-support + + KAuth::ActionReply reply; +- for (const auto &key : {QStringLiteral("system-manufacturer"), +- QStringLiteral("system-product-name"), +- QStringLiteral("system-version"), +- QStringLiteral("system-serial-number")}) { +- QProcess proc; +- proc.start(dmidecode, {QStringLiteral("--string"), key}); +- proc.waitForFinished(); +- const QByteArray output = proc.readAllStandardOutput().trimmed(); +- +- if (output.isEmpty() || proc.error() != QProcess::UnknownError || proc.exitStatus() != QProcess::NormalExit) { ++ ++ const auto keys = {QStringLiteral("system-manufacturer"), ++ QStringLiteral("system-product-name"), ++ QStringLiteral("system-version"), ++ QStringLiteral("system-serial-number")}; ++ ++ for (const auto &key : keys) { ++ auto result = executeDmidecode({QStringLiteral("--string"), key}); ++ if (result.failed()) { + continue; + } + ++ const auto output = result.data().value("result").toString(); ++ + // Fairly exhaustive filter list based on a dozen or so samples gathered from reddit and other places. + // These are values that may appear in the DMI system information but aren't really useful. + static const auto dummyData = make_array(QStringLiteral("system version"), +@@ -59,12 +63,34 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + QStringLiteral("not specified"), + QStringLiteral("not applicable") + /* may also be empty, but that is filtered above already */); ++ + if (std::find(dummyData.cbegin(), dummyData.cend(), output.toLower()) != dummyData.cend()) { + continue; + } + + reply.addData(key, output); + } ++ ++ return reply; ++} ++ ++KAuth::ActionReply DMIDecodeHelper::executeDmidecode(const QStringList &arguments) ++{ ++ if (m_dmidecodePath.isEmpty()) { ++ return KAuth::ActionReply::HelperErrorReply(); ++ } ++ ++ QProcess proc; ++ proc.start(m_dmidecodePath, arguments); ++ proc.waitForFinished(); ++ const QByteArray output = proc.readAllStandardOutput().trimmed(); ++ ++ if (output.isEmpty() || proc.error() != QProcess::UnknownError || proc.exitStatus() != QProcess::NormalExit) { ++ return KAuth::ActionReply::HelperErrorReply(); ++ } ++ ++ KAuth::ActionReply reply; ++ reply.addData("result", output); + return reply; + } + +diff --git a/kcms/helpers/dmidecode-helper/helper.h b/kcms/helpers/dmidecode-helper/helper.h +index dd8fe90d..c1b588e8 100644 +--- a/kcms/helpers/dmidecode-helper/helper.h ++++ b/kcms/helpers/dmidecode-helper/helper.h +@@ -1,5 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL + // SPDX-FileCopyrightText: 2021 Harald Sitter ++// SPDX-FileCopyrightText: 2024 Kristen McWilliam + + #pragma once + +@@ -8,6 +9,20 @@ + class DMIDecodeHelper : public QObject + { + Q_OBJECT ++ ++public: ++ explicit DMIDecodeHelper(QObject *parent = nullptr); ++ + public Q_SLOTS: + KAuth::ActionReply systeminformation(const QVariantMap &args); ++ ++private: ++ KAuth::ActionReply executeDmidecode(const QStringList &arguments); ++ ++ /** ++ * Path to the dmidecode binary. ++ * ++ * If the binary is not found, this helper will not work. ++ */ ++ QString m_dmidecodePath; + }; +-- +2.47.0 + diff --git a/0003-kcms-memory-use-KAuth-dmidecode-helper.patch b/0003-kcms-memory-use-KAuth-dmidecode-helper.patch new file mode 100644 index 0000000..61cc5be --- /dev/null +++ b/0003-kcms-memory-use-KAuth-dmidecode-helper.patch @@ -0,0 +1,254 @@ +From 375abcd571b991aa1ea8436fad6c7a4d30f62fa1 Mon Sep 17 00:00:00 2001 +From: Kristen McWilliam +Date: Mon, 14 Oct 2024 15:45:02 -0400 +Subject: [PATCH 3/3] kcms/memory: use KAuth dmidecode helper + +Refactor to use a KAuth helper to run dmidecode as +root, rather than using the CommandOutputContext. + +This means the KCM no longer requires the user to +enter their password to view memory information, +and won't show an obtuse error like before if the +user cancelled the password dialog. +--- + kcms/helpers/dmidecode-helper/helper.cpp | 26 ++++++++++ + kcms/helpers/dmidecode-helper/helper.h | 5 ++ + .../org.kde.kinfocenter.dmidecode.actions | 7 +++ + kcms/memory/CMakeLists.txt | 9 +++- + kcms/memory/main.cpp | 48 ++++++++++++++++--- + kcms/memory/ui/main.qml | 25 ++++++++-- + 6 files changed, 108 insertions(+), 12 deletions(-) + +diff --git a/kcms/helpers/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp +index e9d068dc..11921934 100644 +--- a/kcms/helpers/dmidecode-helper/helper.cpp ++++ b/kcms/helpers/dmidecode-helper/helper.cpp +@@ -26,6 +26,24 @@ DMIDecodeHelper::DMIDecodeHelper(QObject *parent) + m_dmidecodePath = QStandardPaths::findExecutable("dmidecode"); + } + ++KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args) ++{ ++ Q_UNUSED(args); ++ ++ KAuth::ActionReply reply; ++ auto result = executeDmidecode({QStringLiteral("--type"), QStringLiteral("17")}); ++ ++ if (result.failed()) { ++ qWarning() << "DMIDecodeHelper: Unable to get memory information"; ++ return KAuth::ActionReply::HelperErrorReply(); ++ } ++ ++ const QString output = result.data().value("result").toString(); ++ reply.addData("memory", output); ++ ++ return reply; ++} ++ + KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + { + Q_UNUSED(args); +@@ -45,6 +63,8 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + for (const auto &key : keys) { + auto result = executeDmidecode({QStringLiteral("--string"), key}); + if (result.failed()) { ++ qWarning() << "DMIDecodeHelper: Unable to get system information for " << key; ++ // We don't want to fail the entire action if we can't get a single piece of information. + continue; + } + +@@ -71,6 +91,12 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + reply.addData(key, output); + } + ++ if (reply.data().isEmpty()) { ++ qWarning() << "DMIDecodeHelper: Unable to get system information"; ++ // If we didn't get any data, we should fail the action. ++ return KAuth::ActionReply::HelperErrorReply(); ++ } ++ + return reply; + } + +diff --git a/kcms/helpers/dmidecode-helper/helper.h b/kcms/helpers/dmidecode-helper/helper.h +index c1b588e8..805d5fa6 100644 +--- a/kcms/helpers/dmidecode-helper/helper.h ++++ b/kcms/helpers/dmidecode-helper/helper.h +@@ -14,6 +14,11 @@ public: + explicit DMIDecodeHelper(QObject *parent = nullptr); + + public Q_SLOTS: ++ /** ++ * Retrieves memory (RAM) information from dmidecode. ++ */ ++ KAuth::ActionReply memoryinformation(const QVariantMap &args); ++ + KAuth::ActionReply systeminformation(const QVariantMap &args); + + private: +diff --git a/kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions b/kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions +index 66d3aa99..9f0c76f3 100644 +--- a/kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions ++++ b/kcms/helpers/dmidecode-helper/org.kde.kinfocenter.dmidecode.actions +@@ -1,5 +1,7 @@ + # SPDX-License-Identifier: CC0-1.0 + # SPDX-FileCopyrightText: 2021 Harald Sitter ++# SPDX-FileCopyrightText: 2024 Kristen McWilliam ++ + [Domain] + Icon=computer + URL=https://www.kde.org +@@ -47,6 +49,11 @@ Name[x-test]=xxDesktop Management Interfacexx + Name[zh_CN]=桌面管理界面 (DMI) + Name[zh_TW]=桌面管理介面 + ++[org.kde.kinfocenter.dmidecode.memoryinformation] ++Policy=yes ++Name=Memory Information ++Description=Read memory information from system's Desktop Management Interface (DMI) ++ + [org.kde.kinfocenter.dmidecode.systeminformation] + Policy=yes + PolicyInactive=yes +diff --git a/kcms/memory/CMakeLists.txt b/kcms/memory/CMakeLists.txt +index 49219ac4..59c93b69 100644 +--- a/kcms/memory/CMakeLists.txt ++++ b/kcms/memory/CMakeLists.txt +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: BSD-3-Clause + # SPDX-FileCopyrightText: 2024 Thomas Duckworth ++# SPDX-FileCopyrightText: 2024 Kristen McWilliam + + find_package(dmidecode) + set_package_properties(dmidecode PROPERTIES TYPE RUNTIME) +@@ -7,4 +8,10 @@ set_package_properties(dmidecode PROPERTIES TYPE RUNTIME) + add_definitions(-DTRANSLATION_DOMAIN=\"kcm_memory\") + + kinfocenter_add_kcm(kcm_memory main.cpp) +-target_link_libraries(kcm_memory PRIVATE KF6::CoreAddons KF6::KCMUtilsQuick KF6::I18n KInfoCenterInternal) ++target_link_libraries(kcm_memory PRIVATE ++ KF6::AuthCore ++ KF6::CoreAddons ++ KF6::KCMUtilsQuick ++ KF6::I18n ++ KInfoCenterInternal ++) +diff --git a/kcms/memory/main.cpp b/kcms/memory/main.cpp +index d2190140..7aab18ce 100644 +--- a/kcms/memory/main.cpp ++++ b/kcms/memory/main.cpp +@@ -1,30 +1,64 @@ + /* + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL + SPDX-FileCopyrightText: 2024 Thomas Duckworth ++ SPDX-FileCopyrightText: 2024 Kristen McWilliam + */ + ++#include ++#include ++#include + #include + #include + +-#include "CommandOutputContext.h" +- + class KCMMemory : public KQuickConfigModule + { + Q_OBJECT +- Q_PROPERTY(CommandOutputContext *infoOutputContext READ outputContext CONSTANT FINAL) ++ Q_PROPERTY(QString memoryInformation READ memoryInformation NOTIFY changed) + public: + explicit KCMMemory(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("pkexec"), {"dmidecode", "--type", "17"}, parent); ++ loadData(); + } +- CommandOutputContext *outputContext() const ++ ++ QString memoryInformation() const + { +- return m_outputContext; ++ return m_memoryInformation; + } + + private: +- CommandOutputContext *m_outputContext; ++ Q_SIGNAL void changed(); ++ ++ /** ++ * The memory information that will be displayed in the KCM. ++ */ ++ QString m_memoryInformation; ++ ++ /** ++ * Load the memory information from the dmidecode helper. ++ */ ++ void loadData() ++ { ++ KAuth::Action action(QStringLiteral("org.kde.kinfocenter.dmidecode.memoryinformation")); ++ action.setHelperId(QStringLiteral("org.kde.kinfocenter.dmidecode")); ++ KAuth::ExecuteJob *job = action.execute(); ++ ++ connect(job, &KJob::result, this, [this, job]() { ++ if (job->error()) { ++ qWarning() << "Failed to retrieve memory information: " << job->errorString(); ++ return; ++ } else { ++ const auto reply = job->data(); ++ if (reply.contains("memory")) { ++ m_memoryInformation = reply["memory"].toString(); ++ } ++ } ++ ++ Q_EMIT changed(); ++ }); ++ ++ job->start(); ++ } + }; + + K_PLUGIN_CLASS_WITH_JSON(KCMMemory, "kcm_memory.json") +diff --git a/kcms/memory/ui/main.qml b/kcms/memory/ui/main.qml +index 0300d619..42fdcbc7 100644 +--- a/kcms/memory/ui/main.qml ++++ b/kcms/memory/ui/main.qml +@@ -1,14 +1,31 @@ + /* + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL + SPDX-FileCopyrightText: 2024 Thomas Duckworth ++ SPDX-FileCopyrightText: 2024 Kristen McWilliam + */ + +-import QtQuick 2.5 ++import QtQuick 2.15 + ++import org.kde.kirigami 2.20 as Kirigami + import org.kde.kcmutils as KCM + +-import org.kde.kinfocenter.private 1.0 as KInfoCenter ++KCM.SimpleKCM { ++ id: kcm_memory ++ Kirigami.Theme.colorSet: Kirigami.Theme.View ++ Kirigami.Theme.inherit: false + +-KInfoCenter.CommandOutputKCM { +- output: kcm.infoOutputContext ++ Kirigami.PlaceholderMessage { ++ anchors.centerIn: parent ++ width: parent.width - (Kirigami.Units.largeSpacing * 8) ++ visible: kcm.memoryInformation === "" ++ icon.name: "data-warning" ++ text: i18ndc("kinfocenter", "@info the KCM has no data to display", "No data available") ++ } ++ ++ Kirigami.SelectableLabel { ++ id: text ++ text: kcm.memoryInformation ++ font.family: "monospace" ++ visible: kcm.memoryInformation !== "" ++ } + } +-- +2.47.0 + diff --git a/kinfocenter-6.1.3.tar.xz b/kinfocenter-6.1.3.tar.xz new file mode 100644 index 0000000..f72d4e9 --- /dev/null +++ b/kinfocenter-6.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69c4bebf97c5a980c3da57deedfff628254f03b7c094cca8d742f537bfc45738 +size 718828 diff --git a/kinfocenter-6.1.3.tar.xz.sig b/kinfocenter-6.1.3.tar.xz.sig new file mode 100644 index 0000000..c590ce7 --- /dev/null +++ b/kinfocenter-6.1.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaWVKMACgkQ11dEg7tX +sY3JMQ//Vdl6zMvBjoSN2gQQZK0Cq+lEiZHQsewVQXT9SgiZPrrjyHX0fv2l0Mpp +h8Q+wyQuvgBY5JYOslz5UVp/FdQwIeglWKTQ/SzifOizPsBT4P0brqDJEzcz5BJJ +eZtnzqVMMu2avmdOoBpgNR/oiSu4FSgwsRsSFrKEBTDT7DPE0CUsbTuUEIX5zy4l +iDjc2Nyv5On/O8OCCgN7aMV3Rp0fZtdrJXiqPeP05iY/R/AtBjzr3gk724Rc6T2N +zMHEZQDAsp1uluWhIKL/Wo8mkHdxSuQUk2fefnQ9USVPRb4oB3F2eIteYqzi4lVl +9FA9BptbZfvB9dcd9b8MPBg0ZKQ6ft1KbqdP2pKOBOHHcImaBvAhf8+3zHJL4mNP +AG+kvCfAhfAy1HrZX3w2LaT0H29N85ACgXAEiseUvSW7gRK18DNhTATztVMYF1tV +Nf1PFumtvtVFPhkqYYBAGv/bnTVRXQGVA5uI/4aN/CRN/y6tA3RbvkqHf4aZH/K0 +/kK8tLcoy6sNyiPXZ+8N35PUDRrNl8A+6C39RgYznjFr4IVuODXSSmJtnRFm7RZB +c4kBzrylL7wdPHPGjjnADHj7bC7VZo2zxLqD6iHvIVZhknRxKbZsJL96CziFspD0 +/4dEIYE6KpR6yjhjZ3qdq/0AmiOcE+DPDEpwZ+mj7RhAvxjukaI= +=H72k +-----END PGP SIGNATURE----- diff --git a/kinfocenter-6.1.4.tar.xz b/kinfocenter-6.1.4.tar.xz new file mode 100644 index 0000000..ece175b --- /dev/null +++ b/kinfocenter-6.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:179dfdc224ff66f1d692456560b1c9f0dd74b568e233347182316709ac2520d9 +size 718988 diff --git a/kinfocenter-6.1.4.tar.xz.sig b/kinfocenter-6.1.4.tar.xz.sig new file mode 100644 index 0000000..51c8a64 --- /dev/null +++ b/kinfocenter-6.1.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmayGCEACgkQ11dEg7tX +sY0/kw/9HIB8Hbw4Mz0qmz0xmswOKEkoRErJhUR56EhPh0uNFQsvMidUB5ubpHyJ +x4JDX8dvAzT1uPITDfG7fLq9gPRUoJkALLXl4serf61nE5zdWAGVuSgK+NMQFN8t +fHrH/cZfqKMbtszFDO/IDpPj5Kr2Irwdi/bgVkZSrkyaKrznOVkAZp1GIwo79y97 +jRet86vZPwmlhSTtmcCeIOgkMz7JkxZ6O0pb+bb7m6cIE2IIITNFWXBv0xgcPsO0 +AmqZc4hnR3yf91dFoQp4M2PQZwBmV+MboIRxmvJFkojd3uiqAeXjKllKP/zp/3Gn +KA/U8lbsP0qAzvRrJGn8QZ5L2pWsSdPjiT9hkJ5qFgkNOxM+xZyvGPbAte/yo58i +VDrReeiQKoIcnvworlcZUiEMNai0kRJP+UA6MUhV9vViOB6ZTgRIQ/imukeSJana ++qC8kz6dzcKdzU8b/gu88VKJfTEARjLpAhwx3JqLKKgR6fq3XUfK5AqdELrJV1gc +Asjsix4mFV5QzDQaPwk4k/ye0kV2L45cLue072R3kqGWstWM5hbAh5NjffSIyqPt +Zy+E/f5JxtFh4u3WZRyZPHF9wR66lTe4CzYXCnploFMBz7gA7f+dtyiA5uQ+YdYU +ulTrwTTX0H4RJEADErfZkWMlFOE+eQsn3yCA9uZy9/6uRv78F1A= +=lLoV +-----END PGP SIGNATURE----- diff --git a/kinfocenter-6.1.5.tar.xz b/kinfocenter-6.1.5.tar.xz new file mode 100644 index 0000000..05d8f85 --- /dev/null +++ b/kinfocenter-6.1.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0976ae43756b6ddbf4e70e750cb17f422dabe7604c5e2f824ab4f1e0161ae5d0 +size 720016 diff --git a/kinfocenter-6.1.5.tar.xz.sig b/kinfocenter-6.1.5.tar.xz.sig new file mode 100644 index 0000000..5695668 --- /dev/null +++ b/kinfocenter-6.1.5.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCFQACgkQ11dEg7tX +sY2jxRAAukjAlx7cA4jJNgoqhjKhqjoYTJuhcZPxkwKVqyyGcArtHlciKGndpz/d +2YyoN6HDY9z8tIbwJTgJ2mPNqHnwaT8FPitkA8fO54McoWnfqCUNCVOE56wKYZPq +T3bqlLfO1fipyGsffs+ivTXl1jYWjt8wGSSnVI/a89/HKcn/snqAoTvhlfnzQg5m +SIsxPEXjP9lPuDJtKbvUWHV5ZzlZ8RY/EfeOzIYzypBP9eftqsEgVrZqdSnaiSat ++16ffHMl2CThSJ8y/6yUIAo65MNX+Ikw1oYWjRPhArmUPDpes15r+wdd/gkqWAJi +GfDL5pSwv5A8h+0BF9y0DHLpjAP5TDpja0kyVfGeUFfoSg9mNGWmfux4C5NOjW0D +ul0jalqz0D+PbIE7Q3ft2X65gQaoUfyI4qN49M649UHN04e5Eu15P5Wkbimo/qo2 +Js+ESeYvBTkYGiWrGlJ6iSqOJgAM1olmaSw/7smuMYJA7RtRKwk26QOOZmEvzlST +UmrG8Ljto8FKRFuIvLha6vIsvbGjSLcI4Cu9doX3DZ7sw99msB49EUI5GRtM3n37 +GWrzHwKswlNrjdUXrJVpbVYc1mHsrghOWGv2pwm73gYyUm3jU7+pHTTc1xcdozw/ +4oxAlZyoUTvDPA5432JLObQf+jScjXIOSASzuiZcpdNkMEFmYeE= +=acRA +-----END PGP SIGNATURE----- diff --git a/kinfocenter-6.2.0.tar.xz b/kinfocenter-6.2.0.tar.xz new file mode 100644 index 0000000..08c581b --- /dev/null +++ b/kinfocenter-6.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:508730f7b44dc85ba4e67caf526199528cefcf3dd603f6280917a930e0fe06cc +size 729176 diff --git a/kinfocenter-6.2.0.tar.xz.sig b/kinfocenter-6.2.0.tar.xz.sig new file mode 100644 index 0000000..22192d7 --- /dev/null +++ b/kinfocenter-6.2.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmb+j+oACgkQ11dEg7tX +sY24wg//ZVyr962LpPxP+eaAnBqgNW0svVjOS9IA7Nmct0Ux0uGM0pFNPKq+RMrI +6ieWbSBBVzwhk32/Phi5u5F0LCbIQMs2r7I+Uouj+MbYte4AxBD1PureLlm91S+n +lJZrx+FJDuSxUQ+jN1e7B2SCST7ZL92EHrQX9FTGAFBs4ZyEz6oJJ5F6IKNnN7D7 +gpn0agtaW6DbfXLIP4VZ3/4niNtbOCAsZquY+hY4hyzVgeVzaAfror8wvzyaEyI6 +bzFzN+vFUzuAzBUm2a7cx3/ETfX/d/nFMZ65VPxKPhgVznk5+HH1jEcu0Xbw4oQb +vA67c1DdT77sXFYp6KDt9OxKSH+foPS18WVcFRV7RuJ+KQPp4zgvug32ZLahnzcw +FCD0Vx6iWP+9ZWMgmTHz+Bm8pGJFKG9P+7aM0AkanYmVJlxKprc+P7geo8iq6Um7 +xO/rnw7x/5ht//6lwzUxq4Cd6Wh9kMlugV3zpajGriH0ffavybvppWQjvVfKBR0b +WnvywpM4XMp5RErF08kk9/H5LNoYDkhg+E+mR1YOLJU0aRxUOQSacIxivA77quRl +ys5Nw01QztnfHIdjQKXn2J7OroYmrCfYxOvn2Zg/6qTFUzYMfE6Lq+Nk33pk3jxM ++wh23CF8oGjZB3ksIRPFw7f07JUb51wJix7rDY8rx5PL/0VhFro= +=uQfZ +-----END PGP SIGNATURE----- diff --git a/kinfocenter-6.2.1.tar.xz b/kinfocenter-6.2.1.tar.xz new file mode 100644 index 0000000..c96111d --- /dev/null +++ b/kinfocenter-6.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:504162e6c9ba91f3d1af0898debe2b6a9c3f515bffb589227e739907b68060eb +size 731224 diff --git a/kinfocenter-6.2.1.tar.xz.sig b/kinfocenter-6.2.1.tar.xz.sig new file mode 100644 index 0000000..7ec05cf --- /dev/null +++ b/kinfocenter-6.2.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmcOan0ACgkQ11dEg7tX +sY3HtQ/9FEUzzWZTP5U5zNePx7nId/dmRqZG7jRfOMZU7PaFxKmuLj0rkjP63Auj +SjhzSkEdSGP/q9rprpmZSywk7IOjKdIJYcFDaWKMvR21xbZmvv84lF8Gt4Mb5zI6 +PoCJYcVDJtTFbhZhyUqarkjx4/v+urERzbqlFR5mzPk9NnRYC91NGY5Jj2zgFNb3 +mD0dZ8ItnbZ+OvTubiA6tJEIeLHJEajrB+ldl3ope7as83EFEMgCOUWkB2zrFjQj +j+KxawmzwoJ5GwdQq003bH5/SV7Rm65oksXtgpXS8EakH/W2vrqn9dHGJ3Lgz9CK +miIqKZcSVqojyGIbnbc8Ro4YhPEMv2CeKND94Eg9+Ws9ogTR9c7f6lvrxs3pkEY7 ++zXAqWxgYwOJFpzAzBVlwSqTVnETg2yXXkCeN27txz+ZBlmSlpNaP54uzEhywukn +gNv7nz4SqmXrWFLGRhd2SxFym/EyS2IgkJW/A0d0DyihRV/7hPQhkuYiZeSJH3zM +wM0OtlHYcJ75mfIsjGaEFqbPm9zKy5VTEuymcYJ1BCyuP9FGQ6xywycDaLCnyzK8 +2fg3zM9jqI2ROn/+XKpWO+H2sq0E2vV3p2nMkhVV0qjvtebICHLUWIPg/EHu8Jok +GW8b/27xecwETYpJDeBAN/miNbicI9qPpho+CLdzRtszHazpiJs= +=PIpt +-----END PGP SIGNATURE----- diff --git a/kinfocenter-6.2.2.tar.xz b/kinfocenter-6.2.2.tar.xz new file mode 100644 index 0000000..905d538 --- /dev/null +++ b/kinfocenter-6.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40d53aebd31d25aac3ace601bb222297bd53d2b71f510cbf8eac4ba5992b5477 +size 731244 diff --git a/kinfocenter-6.2.2.tar.xz.sig b/kinfocenter-6.2.2.tar.xz.sig new file mode 100644 index 0000000..cffb87d --- /dev/null +++ b/kinfocenter-6.2.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmcXoM4ACgkQ11dEg7tX +sY1DUw/+Ng70dMcy51T2KbqSmNEJw2HKrYaJPcTlH1OKxO3sGTMcH4eG6zIkmQUp +Mf8Egv6dqUfJN95DR0iUF4djrq8GbVRw0gN9ZSpaNG54prP50XUugEA5Agn4QT2h +GF2kf5mg4lHFpAkMlkg+/c8Y5vRetrwrSX2J9hT0A8gQPkm2hRpkIn+0Cdd4tAZV +lwrGqity10PuIBkOkTn+o/JdPJoO4rSIjSRZwgtCvYfQS+84/BQWUu2qu5IgKfIj +trmunNwanWIDA3GGi6Iku5zcwDaZ0DZANwnHxFJh504MSyXqg5dNtUfcqUjB3eVE +ufFjgmKlG6wvau3NlJA0IKtm9jFsk3UAHfbJWxOZuF2N2Eiuh8C/pMr+fXxshOV8 +Lu4R01ahrYITvyOzQNDnMNXbtKGiQa/0VZrsUa9B9vjbP435kcA757kgrUZxPpS5 +EBk72qIHwvvOLzppvYuSeH6+usJNjcrov8oo9uLVbZ+tfE0YVXStOe0gOWteejF/ +bjsEEZb/hUubDJQUIzJtIMn8+zKGOXG6MRZRxvusGOn7phA/PH9akSK4MSws++Aa +IeaKMQcmLuOEwVwfUblSn2E/scThB7wqMlHgUOfESsNl4vqoga6HWkVYxBsI3dC9 +ZldiwHpyraL+c3aJIJjiBiByOnYMzaHPUUzbI53VmUJhOW4hXww= +=z2Ba +-----END PGP SIGNATURE----- diff --git a/kinfocenter6.changes b/kinfocenter6.changes new file mode 100644 index 0000000..b0b8d18 --- /dev/null +++ b/kinfocenter6.changes @@ -0,0 +1,211 @@ +------------------------------------------------------------------- +Tue Oct 22 14:07:23 UTC 2024 - Fabian Vogt + +- Update to 6.2.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.2 +- Changes since 6.2.1: + * update version for new release + +------------------------------------------------------------------- +Thu Oct 17 08:32:43 UTC 2024 - Fabian Vogt + +- Add patches to fix the memory info page by switching from pkexec + to KAuth: + * 0001-kcms-pull-dmidecode-helper-into-a-separate-dir.patch + * 0002-refactor-dmidecode-helper-support-multiple-methods.patch + * 0003-kcms-memory-use-KAuth-dmidecode-helper.patch + +------------------------------------------------------------------- +Tue Oct 15 16:53:24 UTC 2024 - Fabian Vogt + +- Update to 6.2.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.1 +- Changes since 6.2.0: + * update version for new release + +------------------------------------------------------------------- +Sat Oct 5 10:44:16 UTC 2024 - Fabian Vogt + +- Update to 6.2.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.0 +- Changes since 6.1.90: + * update version for new release + +------------------------------------------------------------------- +Tue Sep 17 14:53:27 UTC 2024 - Fabian Vogt + +- Update to 6.1.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.1.90 +- Changes since 6.1.5: + * update version for new release + * Use ECMDeprecationSettings + * kcms: Add memory information KCM + * update version for new release + * remove dup appstream versions + * update version for new release + * appstream versions + * update version for new release + * Drop no longer needed KF6Widgets dependency + * update version for new release + +------------------------------------------------------------------- +Tue Sep 10 14:53:42 UTC 2024 - Fabian Vogt + +- Update to 6.1.5: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.5 +- Changes since 6.1.4: + * update version for new release + +------------------------------------------------------------------- +Tue Aug 6 13:26:44 UTC 2024 - Fabian Vogt + +- Update to 6.1.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.4 +- Changes since 6.1.3: + * update version for new release + +------------------------------------------------------------------- +Tue Jul 16 13:23:36 UTC 2024 - Fabian Vogt + +- Update to 6.1.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.3 +- Changes since 6.1.2: + * update version for new release + +------------------------------------------------------------------- +Tue Jul 2 17:34:02 UTC 2024 - Fabian Vogt + +- Update to 6.1.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.2 +- Changes since 6.1.1: + * update version for new release + +------------------------------------------------------------------- +Tue Jun 25 17:13:07 UTC 2024 - Fabian Vogt + +- Update to 6.1.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.1 +- Changes since 6.1.0: + * update version for new release + * remove dup appstream versions + * update version for new release + +------------------------------------------------------------------- +Thu Jun 13 10:58:28 UTC 2024 - Fabian Vogt + +- Update to 6.1.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.0 +- Changes since 6.0.90: + * update version for new release + * appstream versions + * update version for new release + * Drop no longer needed KF6Widgets dependency + +------------------------------------------------------------------- +Sat May 25 11:18:07 UTC 2024 - Fabian Vogt + +- Update to 6.0.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.0.90 +- Too many changes to list here + +------------------------------------------------------------------- +Wed May 22 07:43:03 UTC 2024 - Fabian Vogt + +- Update to 6.0.5: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.5 +- Changes since 6.0.4: + * remove dup version + * update version for new release + +------------------------------------------------------------------- +Wed Apr 17 08:12:28 UTC 2024 - Fabian Vogt + +- Update to 6.0.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.4 +- Changes since 6.0.3: + * update version for new release + * revert premature appstream update + * update version for new release + * revert duplicate appstream entry + +------------------------------------------------------------------- +Tue Mar 26 18:05:33 UTC 2024 - Fabian Vogt + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Changes since 6.0.2: + * Remove sl documentation + * update version for new release + +------------------------------------------------------------------- +Wed Mar 13 09:09:39 UTC 2024 - Fabian Vogt + +- Update to 6.0.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.2 +- Changes since 6.0.1: + * update version for new release + +------------------------------------------------------------------- +Wed Mar 6 08:40:27 UTC 2024 - Fabian Vogt + +- Update to 6.0.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.1 +- Changes since 6.0.0: + * update version for new release + +------------------------------------------------------------------- +Mon Mar 4 18:52:10 UTC 2024 - Christophe Marin + +- Add Provides/Obsoletes to replace Plasma 5 + +------------------------------------------------------------------- +Wed Feb 21 18:36:12 UTC 2024 - Fabian Vogt + +- Update to 6.0.0: + * New bugfix release + * Release announcement not available yet +- Changes since 5.93.0: + * update version for new release + * Avoid QML singletons to work with shared QML engines (kde#480881) + * update version for new release + +------------------------------------------------------------------- +Wed Jan 31 17:37:02 UTC 2024 - Fabian Vogt + +- Update to 5.93.0 (6.0 RC 2): + * New bugfix release + * See https://kde.org/announcements/megarelease/6/rc2/ for details +- Changes since 5.92.0: + * about (dump): don't print wayland warnings after data dump + * about (dump): show all windows in minimized mode + * Fix translation not being shown + * about-distro: remove separator lines + * Remove extraFooterTopPadding usage + +------------------------------------------------------------------- +Mon Jan 15 21:08:45 UTC 2024 - Fabian Vogt + +- Update to 5.92.0 (6.0 RC 1) + * For more details please see: + https://kde.org/announcements/megarelease/6/rc1/ + +------------------------------------------------------------------- +Mon Jul 10 08:03:06 UTC 2023 - Christophe Marin + +- Init kinfocenter6 diff --git a/kinfocenter6.spec b/kinfocenter6.spec new file mode 100644 index 0000000..a82d059 --- /dev/null +++ b/kinfocenter6.spec @@ -0,0 +1,150 @@ +# +# spec file for package kinfocenter6 +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define kf6_version 6.5.0 +%define qt6_version 6.7.0 + +%define rname kinfocenter +%bcond_without released +# Full Plasma 6 version (e.g. 6.0.0) +%{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}} +# Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF) +%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} +Name: kinfocenter6 +Version: 6.2.2 +Release: 0 +Summary: Utility that provides information about a computer system +License: GPL-2.0-or-later +URL: https://www.kde.org/ +Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +%if %{with released} +Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source2: plasma.keyring +%endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-kcms-pull-dmidecode-helper-into-a-separate-dir.patch +Patch2: 0002-refactor-dmidecode-helper-support-multiple-methods.patch +Patch3: 0003-kcms-memory-use-KAuth-dmidecode-helper.patch +# PATCH-FIX-OPENSUSE +Patch100: 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: pkgconfig +# For creating the post-install symlink +BuildRequires: systemsettings6 +BuildRequires: update-desktop-files +BuildRequires: cmake(KF6Auth) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6KCMUtils) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Service) >= %{kf6_version} +BuildRequires: cmake(KF6Solid) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: pkgconfig(libusb-1.0) +Provides: kinfocenter5 = %{version} +Obsoletes: kinfocenter5 < %{version} +Obsoletes: kinfocenter5-lang < %{version} +Requires: kf6-kcmutils-imports >= %{kf6_version} +# needed for the fileindexermonitor +Requires: kf6-baloo-imports >= %{kf6_version} +# The executable is now a link to systemsettings6 +Requires: systemsettings6 +# lspci is called by the PCI KCM +Requires: pciutils +# GLX is always present +Requires: /usr/bin/glxinfo +# Vulkan might not be needed +Requires: (/usr/bin/vulkaninfo if libvulkan1) +# Plasma Wayland and X11 sessions are always installed +Requires: /usr/bin/wayland-info +Requires: /usr/bin/xdpyinfo +# Note: Not available as /usr/bin/eglinfo yet (boo#1195695) +Recommends: /usr/bin/eglinfo +# The "Firmware Security" page does fwupdmgr ... | aha | ... +Recommends: (aha if fwupd) +# 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. + +%lang_package + +%prep +%autosetup -p1 -n %{rname}-%{version} + +%build +%cmake_kf6 + +%kf6_build + +%install +%kf6_install + +%find_lang %{name} --all-name --with-html + +%files +%license LICENSES/*.txt +%doc %lang(en) %{_kf6_htmldir}/en/kinfocenter/ +%{_kf6_applicationsdir}/kcm_about-distro.desktop +%{_kf6_applicationsdir}/kcm_energyinfo.desktop +%{_kf6_applicationsdir}/org.kde.kinfocenter.desktop +%{_kf6_appstreamdir}/org.kde.kinfocenter.appdata.xml +%{_kf6_bindir}/kinfocenter +%dir %{_kf6_configdir}/menus +%{_kf6_configdir}/menus/kinfocenter.menu +%{_kf6_libdir}/libKInfoCenterInternal.so +%{_kf6_plugindir}/plasma/kcms/kcm_about-distro.so +%{_kf6_plugindir}/plasma/kcms/kcm_energyinfo.so +%dir %{_kf6_plugindir}/plasma/kcms/kinfocenter/ +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_audio_information.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_block_devices.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_cpu.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_egl.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_firmware_security.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_glx.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_interrupts.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_kwinsupportinfo.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_memory.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_network.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_opencl.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_pci.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_samba.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_usb.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_vulkan.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_wayland.so +%{_kf6_plugindir}/plasma/kcms/kinfocenter/kcm_xserver.so +%{_kf6_qmldir}/org/kde/kinfocenter/ +%{_kf6_sharedir}/dbus-1/system-services/org.kde.kinfocenter.dmidecode.service +%{_kf6_dbuspolicydir}/org.kde.kinfocenter.dmidecode.conf +%{_kf6_sharedir}/desktop-directories/ +%dir %{_kf6_sharedir}/kinfocenter/ +%{_kf6_sharedir}/kinfocenter/categories/ +%{_kf6_sharedir}/kinfocenter/firmware_security/ +%{_kf6_sharedir}/polkit-1/actions/org.kde.kinfocenter.dmidecode.policy +%{_kf6_libexecdir}/kauth/kinfocenter-dmidecode-helper + +%files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en + +%changelog diff --git a/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..df40fb7 Binary files /dev/null and b/plasma.keyring differ