diff options
| -rw-r--r-- | kde-plasma/kinfocenter/kinfocenter-5.21.2-r10.ebuild (renamed from kde-plasma/kinfocenter/kinfocenter-5.21.0-r10.ebuild) | 0 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/Manifest | 1 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch | 26 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/no-systemd-land.patch | 75 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.21.0-r10.ebuild | 72 |
5 files changed, 0 insertions, 174 deletions
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.0-r10.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.2-r10.ebuild index 6433c17c..6433c17c 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.21.0-r10.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.21.2-r10.ebuild diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest deleted file mode 100644 index 2a5496e2..00000000 --- a/kde-plasma/libksysguard/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libksysguard-5.21.0.tar.xz 705860 BLAKE2B 32048c24c756b77891ebb3531d6a0f5272e4f1486411161ef6ef00ed51fe58be46beaf6f37ac468e85092588b97573ef7f95b2f1ce434f7a876c292a509c54ae SHA512 a2e655dcb14ce4776d55ac88d550b7f284877d5d5f94c26b3c3d171b7fb29e4e02670e1eeb203dc73c22da56f23cadc21eda680f8ed57ea28a6bde51efb54de1 diff --git a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch deleted file mode 100644 index 477f88d4..00000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 7 Jun 2019 22:58:55 +0200 -Subject: [PATCH] Gentooify message about QtWebEngineWidgets - -Translations can not be provided for this. ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index 83cf895..647194a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) { - mScriptingHtmlDialog->webView()->load(fileName); - #else - QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"), -- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); -+ QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available.")); - #endif - } - #if HAVE_QTWEBENGINEWIDGETS --- -2.21.0 - diff --git a/kde-plasma/libksysguard/files/no-systemd-land.patch b/kde-plasma/libksysguard/files/no-systemd-land.patch deleted file mode 100644 index 2df3c447..00000000 --- a/kde-plasma/libksysguard/files/no-systemd-land.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/processcore/cgroup_data_model.cpp b/processcore/cgroup_data_model.cpp -index 46a36c3915c7b2b3fc15d3a707b7318be68b68cb..4278a2c59714511765a6db7258815ff72865e8ab 100644 ---- a/processcore/cgroup_data_model.cpp -+++ b/processcore/cgroup_data_model.cpp -@@ -48,6 +48,7 @@ public: - QHash<QString, KSysGuard::ProcessAttribute* > m_availableAttributes; - QVector<KSysGuard::ProcessAttribute* > m_enabledAttributes; - -+ bool m_available = false; - QString m_root; - QScopedPointer<CGroup> m_rootGroup; - -@@ -367,9 +368,22 @@ void CGroupDataModel::setRoot(const QString &root) - return; - } - d->m_root = root; -- d->m_rootGroup.reset(new CGroup(root)); - emit rootChanged(); - QMetaObject::invokeMethod(this, [this] {update();}, Qt::QueuedConnection); -+ -+ const QString path = CGroup::cgroupSysBasePath() + root; -+ bool available = QFile::exists(path); -+ -+ if (available) { -+ d->m_rootGroup.reset(new CGroup(root)); -+ } else { -+ d->m_rootGroup.reset(); -+ } -+ -+ if (available != d->m_available) { -+ d->m_available = available; -+ emit availableChanged(); -+ } - } - - void CGroupDataModel::update() -@@ -443,6 +457,11 @@ void CGroupDataModel::update(CGroup *node) - } - } - -+bool CGroupDataModel::isAvailable() const -+{ -+ return d->m_available; -+} -+ - QVector<Process*> CGroupDataModelPrivate::processesFor(CGroup *app) - { - if (m_processMap.contains(app)) { -diff --git a/processcore/cgroup_data_model.h b/processcore/cgroup_data_model.h -index 5ce58aada3e9a1750914fbe9a2c455dc236ec588..1f7d28d12226f30968a4d9b61ac117c1863a4901 100644 ---- a/processcore/cgroup_data_model.h -+++ b/processcore/cgroup_data_model.h -@@ -59,6 +59,8 @@ class Q_DECL_EXPORT CGroupDataModel : public QAbstractItemModel - */ - Q_PROPERTY(QString setRoot READ root WRITE setRoot NOTIFY rootChanged) - -+ Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged) -+ - public: - CGroupDataModel(QObject *parent = nullptr); - CGroupDataModel(const QString &root, QObject *parent = nullptr); -@@ -114,10 +116,13 @@ public: - */ - void update(); - -+ bool isAvailable() const; -+ - Q_SIGNALS: - void enabledAttributesChanged(); - void enabledChanged(); - void rootChanged(); -+ void availableChanged(); - - protected: - virtual bool filterAcceptsCGroup(const QString &id); diff --git a/kde-plasma/libksysguard/libksysguard-5.21.0-r10.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.0-r10.ebuild deleted file mode 100644 index 91e75659..00000000 --- a/kde-plasma/libksysguard/libksysguard-5.21.0-r10.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="true" -KFMIN=5.78.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Task management and system monitoring library" -LICENSE="LGPL-2+" -SLOT="5/9" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="webengine X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - sys-libs/zlib - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5 - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) -" -DEPEND="${RDEPEND} - !<kde-plasma/plasma-workspace-5.18.80:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" - "${FILESDIR}/no-systemd-land.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package webengine Qt5WebChannel) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} - -src_test() { - LC_NUMERIC="C" ecm_src_test # bug 695514 -} |