diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /kde-plasma/libksysguard | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'kde-plasma/libksysguard')
-rw-r--r-- | kde-plasma/libksysguard/Manifest | 8 | ||||
-rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch | 76 | ||||
-rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild | 79 | ||||
-rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.23.5.ebuild | 2 | ||||
-rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.23.90.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.23.4.ebuild) | 6 |
5 files changed, 7 insertions, 164 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index d8548219c60c..a4fe65640dfa 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,8 +1,6 @@ AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b -AUX libksysguard-5.23.4-fix-segfault.patch 2863 BLAKE2B f29737e9bea3c9ab75e3b7e349577eb368543c18e2f54a999f1cd67a9ae6d81e438dab5567635aa665f8c53087cd03e2a1345fbb0e58825ffd638c691ab26363 SHA512 681eb69991d14c063e070334bb8ea5b14e7efa1b4eef4e823581f575f19d121ee9a65b0d54e810b772c65d418410fc85093daf6fcc1c10a816ff19dad28de518 -DIST libksysguard-5.23.4.tar.xz 769308 BLAKE2B 05238556867dc054d4c9bd5eadf6c16db6ffdbb481c93a3efc4e83059da6eea73233723ba273a9e5702a2f00a669f8fd0ed54c4a44bdb8797bbc3bb453a71a84 SHA512 8a6c3f06e5f502e9d45fd3ff58fb1da41bd1581164c5054ce79cf2e34c2ece6df22c3b0ab6d33d74d37a97c36cfa076b3a2e459504ea3d3e48d12058aae48648 DIST libksysguard-5.23.5.tar.xz 769012 BLAKE2B 6e819d8552f1cbfbc76cda3b29a69d6605716d26bc7a4b69f48aef6f7510e52d606ae7e7b3bfadd7383888b6e7740c5ba41407975a1570f4f2bc653290bf0a57 SHA512 11b1bae5ec8a0897086556f7f93c8dc8899b7ff7737f738366b50c3fe4b1590e486109e2eb71e76c3321fe3b2baa59fe8031219d2c8c53bb37d925df56c72b3a -EBUILD libksysguard-5.23.4-r1.ebuild 1898 BLAKE2B e51a96e3588e4c63376d0d367c4a78fd21d04bc383705da95a50cef1a243c3e53e6f8c3562ec0d380312355c60e420216ee0fb447116f2d4c5badd5cb508f37a SHA512 17c84f9cd86554904f0923c0363a5f361294293608dd70fbb751f8da39d9c501c266892c33fd2e7698eab0c7cb57cdf1eb6197399daaac8a90c189f646d58d1f -EBUILD libksysguard-5.23.4.ebuild 1827 BLAKE2B 1a742ce353de1c7a94c2ae52b8acccc41cfbbeb628619b167c4cd668c86a72d956875293722e61bbe00a79c00d80447c02a6f7b14f266a6046d16a6492b56c28 SHA512 190c474773b0b34d44a12081a3d95ef5681d868a42fa792eaa4f76427b401a67b5cb4df9949a5bfdc49b28d9aa711311044d334d152646b2e4157aa308e9fb9c -EBUILD libksysguard-5.23.5.ebuild 1830 BLAKE2B e8ae0053af024f73de1d6d6dd5ad11bdc19c00f1c45b9d40f58578df115f71a49d9c93f53db0ba686a67245c9ab17da9acdce7e39d5e4144cc341b1aff9b85c1 SHA512 a216f4faf9acd1713282b8c2bb967d43c56039fca97f63e4a61bce163bf491f606a97d86ed1be57b5e64a8343553ec22c7d8ba5128b20d08fbc31c253e284c74 +DIST libksysguard-5.23.90.tar.xz 767540 BLAKE2B aad6d2a262e34908eae4b69c7543f4498ad82753cbb0a494958d5589278939a9d6f14a2152d4e0939567eb5f39fa45a67d889c2878c9adc42c0ba9d047704fd7 SHA512 8bd31b08a120cf92b1bdbf32327534f8afd391820310fbb2f6c54cd7a609f93902c997c6f32acce7b9c350e96f89cd7e01aedfea0c408b58a0a1a0ea52ee2977 +EBUILD libksysguard-5.23.5.ebuild 1827 BLAKE2B 522a5b2e78388eac433812e02a6ed650c63022b54555329a6455c0a21f8e231e04310abe3a13f152c5d490a5f616ae70e86a9c979680e90e07437424d5bbbd2e SHA512 a6c95ea072b5429d50e289b2d0ec16d86b95a2e7ee8ef8bf9c95e159ac2e61365a37691bce730d12018cf7227712f6b36ce1df13ad3bfc0bb932e90334f9eb87 +EBUILD libksysguard-5.23.90.ebuild 1830 BLAKE2B 6cfcd94f081cb32d9feb5402f129a05e8d32fc601c0fb958217ea1b9f7f405489bd71fd43061f278c0cf84eb02ef5f780111146f04a0498d20cb5b78fc4fc9e4 SHA512 22a50b0fc4fe894995cfaed0e52dc8c09c6b8889efbe0717c8cff7a6d299e8972e7367aa2e8a756063396aa4e2ca051743333d5914d990a8f54dca9112f1b439 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302 diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch deleted file mode 100644 index f37fbf60bf81..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 7 Dec 2021 22:23:17 +0100 -Subject: [PATCH] Handle process parent changes in ProcessDataModel - -When the PPID of a process changes, it moves around in the model, changing the -layout. This needs to be announced properly, otherwise users of the model get -confused, leading to weird behaviour and crashes. - -The added code is pretty much a direct copy from ProcessModel. - -BUG: 446534 - - -(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7) ---- - processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp -index 172ce7f..f776372 100644 ---- a/processcore/process_data_model.cpp -+++ b/processcore/process_data_model.cpp -@@ -24,6 +24,8 @@ public: - Private(ProcessDataModel *q); - void beginInsertRow(KSysGuard::Process *parent); - void endInsertRow(); -+ void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent); -+ void endMoveProcess(); - void beginRemoveRow(KSysGuard::Process *process); - void endRemoveRow(); - -@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q) - connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() { - endInsertRow(); - }); -+ connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) { -+ beginMoveProcess(process, new_parent); -+ }); -+ connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() { -+ endMoveProcess(); -+ }); - connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) { - beginRemoveRow(process); - }); -@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow() - q->endRemoveRows(); - } - -+void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent) -+{ -+ if (m_flatList) -+ return; // We don't need to move processes when in simple mode -+ -+ int current_row = process->parent()->children().indexOf(process); -+ Q_ASSERT(current_row != -1); -+ int new_row = new_parent->children().count(); -+ QModelIndex sourceParent = getQModelIndex(process->parent(), 0); -+ QModelIndex destinationParent = getQModelIndex(new_parent, 0); -+ q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row); -+} -+ -+void ProcessDataModel::Private::endMoveProcess() -+{ -+ if (m_flatList) -+ return; // We don't need to move processes when in simple mode -+ -+ q->endMoveRows(); -+} -+ - void ProcessDataModel::Private::update() - { - Processes::UpdateFlags flags; --- -GitLab - diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild deleted file mode 100644 index 86139aca748a..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="true" -KFMIN=5.86.0 -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 ~riscv x86" -IUSE="webengine X" - -COMMON_DEPEND=" - dev-libs/libnl:3 - >=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 - net-libs/libpcap - sys-apps/lm-sensors:= - sys-libs/libcap - 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="${COMMON_DEPEND} - >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 - !<kde-plasma/plasma-workspace-5.18.80:5 -" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream - "${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534 -) - -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 -} diff --git a/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild index 1c6d4a6ce86c..76c8465b3713 100644 --- a/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library" LICENSE="LGPL-2+" SLOT="5/9" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="webengine X" COMMON_DEPEND=" diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.90.ebuild index 413701ff90e8..5b960e03fd26 100644 --- a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.23.90.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="true" -KFMIN=5.86.0 +KFMIN=5.90.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library" LICENSE="LGPL-2+" SLOT="5/9" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="webengine X" COMMON_DEPEND=" |