[gentoo-commits] repo/gentoo:master commit in: kde-plasma/ksysguard/, kde-plasma/ksysguard/files/

[Andreas Sturmlechner]

commit:     7c7cfcdf3cced39c92e33b917bbedc82955dcd5a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 16:46:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 19:10:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7cfcdf

kde-plasma/ksysguard: EAPI-8 bump, minor upstream backports

Upstream commits:
cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 - Port to QtQuickDialogWrapper
6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 - Add StartupWMClass to desktop file

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...5.22.0-add-StartupWMClass-to-desktop-file.patch | 21 ++++++++
 ...guard-5.22.0-port-to-QtQuickDialogWrapper.patch | 59 ++++++++++++++++++++++
 kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild    | 56 ++++++++++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
new file mode 100644
index 000000000000..8eecf7d8e52f
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
@@ -0,0 +1,21 @@
+From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001
+From: Shriraj Hegde <shriraj.hegde@×××××.com>
+Date: Wed, 9 Jun 2021 08:21:46 +0000
+Subject: [PATCH] Add StartupWMClass to desktop file
+
+---
+ gui/org.kde.ksysguard.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop
+index 0c59d5b7..feb4f220 100755
+--- a/gui/org.kde.ksysguard.desktop
++++ b/gui/org.kde.ksysguard.desktop
+@@ -224,3 +224,4 @@ StartupNotify=true
+ X-DBUS-StartupType=Multi
+ Categories=Qt;KDE;System;
+ X-DBUS-ServiceName=org.kde.ksysguard
++StartupWMClass=ksysguard
+-- 
+GitLab
+

diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
new file mode 100644
index 000000000000..d8e63cf7ca8c
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
@@ -0,0 +1,59 @@
+From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@×××.org>
+Date: Thu, 5 Aug 2021 21:01:30 +0200
+Subject: [PATCH] Port to QtQuickDialogWrapper
+
+---
+ CMakeLists.txt    |  2 +-
+ gui/Workspace.cpp | 13 +++++--------
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23069e76..dcb92975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(KSYSGUARD_VERSION 4.98.0)
+ set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}")
+ 
+ set(QT_MIN_VERSION "5.15.0")
+-set(KF5_MIN_VERSION "5.78")
++set(KF5_MIN_VERSION "5.80")
+ 
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}  ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+diff --git a/gui/Workspace.cpp b/gui/Workspace.cpp
+index 827d63e1..bdd03743 100644
+--- a/gui/Workspace.cpp
++++ b/gui/Workspace.cpp
+@@ -29,8 +29,8 @@
+ #include <KMessageBox>
+ #include <KAcceleratorManager>
+ #include <KActionCollection>
+-#include <KNewStuff3/KNS3/DownloadDialog>
+ #include <KNewStuff3/KNSCore/Engine>
++#include <KNS3/QtQuickDialogWrapper>
+ #include <KConfigGroup>
+ 
+ #include "WorkSheet.h"
+@@ -307,14 +307,11 @@ void Workspace::uploadHotNewWorksheet()
+ }
+ void Workspace::getHotNewWorksheet()
+ {
+-    KNS3::DownloadDialog dialog(QStringLiteral("ksysguard.knsrc"));
+-    if( dialog.exec() == QDialog::Rejected )
+-        return;
+-
+-    KNS3::Entry::List entries = dialog.installedEntries();
+-    foreach(KNS3::Entry entry, entries) {
++    KNS3::QtQuickDialogWrapper dialog(QStringLiteral("ksysguard.knsrc") );
++    const QList<KNSCore::EntryInternal> entries = dialog.exec();
++    for (auto entry : entries) {
+         if(!entry.installedFiles().isEmpty()) {
+-            QString filename = entry.installedFiles().first();
++            const QString filename = entry.installedFiles().constFirst();
+             restoreWorkSheet(filename, true);
+         }
+     }
+-- 
+GitLab
+

diff --git a/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
new file mode 100644
index 000000000000..34a165e4c311
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.88.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Network-enabled resource usage monitor"
+HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libksysguard-5.22.0:5
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-add-StartupWMClass-to-desktop-file.patch
+	"${FILESDIR}"/${P}-port-to-QtQuickDialogWrapper.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package lm-sensors Sensors)
+	)
+	ecm_src_configure
+}