diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
commit | 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch) | |
tree | 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /kde-plasma/ksysguard | |
parent | c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff) |
gentoo resync : 16.01.2021
Diffstat (limited to 'kde-plasma/ksysguard')
4 files changed, 139 insertions, 0 deletions
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest index 07a991955e13..eaaf544b2700 100644 --- a/kde-plasma/ksysguard/Manifest +++ b/kde-plasma/ksysguard/Manifest @@ -1,3 +1,6 @@ +AUX ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch 628 BLAKE2B a069558012a58e83443c82a50d26507f113c8f2f85afbc43c2d0280334281a73f6ca1502390f4779e0fcbb5d3efab34b577009a8da33be585da4b73682eb307a SHA512 d952ab61591b8d6f7270f58fd240fa9258158f117f228a818376f362006cd6d18e6125961f9c0005807964b52a89ac2bc9c2f70b423bd7dffbc0305b4cf6e318 +AUX ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch 1948 BLAKE2B abaf60aab50905c86a8a4cfcfc225681c805fce032298112189e14b49a04f1ddd75373eca0ce14a8460fce393575b0daa9e6f9ef908ed93ed7162af8e7e23576 SHA512 458824f0b8949975dc1c89f493b6bff9e30681b25d06d4880ef970f7c8ea6494cb9d7f84446450556fad996cf3a31ae084e37567a8006f14305f96191004c524 DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2 +EBUILD ksysguard-5.22.0-r1.ebuild 1531 BLAKE2B d2cbada1092a4951c740a5ab5cc36261faba52219a368d40732ee3f8a27b8b1d8327c9cf8164a55dce53e50ce77a6671a35d06eaf10ebf682b9ce9c7b9bc5e75 SHA512 c70982e9ec1c306643bac0c34f81ce1e85acea83eaa9a75b1972324478f16f7bf5a941f217b6d36d10b4e3e38548a76da28c83b8ea506d41f91898dd1fe4cc14 EBUILD ksysguard-5.22.0.ebuild 1469 BLAKE2B 7c4318dfe5ae1475723b41de7f32d59aedcb957e0f54f50a2a37ee62ad98daba8ccfe0dc5d1468e72dbcc7cffc9e34ce6abfda30528ccb7cd7950c2a83852278 SHA512 6639bf8564a66dfa4be2a2ed77abe7c97bc85083ec4f8af0cad6d1e6d8239d032c5eb873007cdd349f2f3183f8c17e7e79a1d7ce4abab1f9283df6588e01eaf4 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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@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 + 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@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 + 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 +} |