kde-plasma/ksysguard: treeclean

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
Arthur Zamarin
2024-07-26 18:08:03 +03:00
parent aa47c7344b
commit b3d33c23b5
6 changed files with 0 additions and 154 deletions

View File

@@ -1 +0,0 @@
DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2

View File

@@ -1,21 +0,0 @@
From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001
From: Shriraj Hegde <shriraj.hegde@gmail.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

View File

@@ -1,59 +0,0 @@
From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.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

View File

@@ -1,56 +0,0 @@
# 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
}

View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
</pkgmetadata>

View File

@@ -266,12 +266,6 @@ dev-php/composer
# Masked for removal on 2024-07-21.
dev-ruby/public_suffix:4
# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-16)
# No release since 2021-06-10 and effectively declared unmaintained by
# upstream since then; now conflicting with Plasma 6 by pulling in old
# kde-plasma/libksysguard:5. Removal on 2024-08-24.
kde-plasma/ksysguard
# Cédric Krier <cedk@gentoo.org> (2023-06-15)
# critical regression with potential data loss:
# https://lists.mercurial-scm.org/pipermail/mercurial-devel/2024-June/297954.html