diff options
Diffstat (limited to 'kde-frameworks/kjobwidgets')
3 files changed, 0 insertions, 127 deletions
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest index 6cd7c0541013..ccde89aa4045 100644 --- a/kde-frameworks/kjobwidgets/Manifest +++ b/kde-frameworks/kjobwidgets/Manifest @@ -1,8 +1,5 @@ -AUX kjobwidgets-5.96.0-fix-ui-server-crash.patch 3545 BLAKE2B 2647b1e300997a7c83c480e47c0495afbc8575d9d705882663f39dfe27156377b25f00ae59a4cd74f4d4114b33c02cb647af9475513e4b29f8ab59f21e0e0c72 SHA512 3ec987ee9dd4a2ab40f3a5e82694982461ca575f835e36d94ca417f35e76dda0c4de619411783b3b636c84541beb1bc12d0334976fc36deb7b7581bb238414cc DIST kjobwidgets-5.100.0.tar.xz 2329668 BLAKE2B a46df80fff8c5fb1de9dadd8c6acfa4199558db50661ab7a089e16d114233fd481a766943febe0251a59d97d638c86935635ac96f3c5736824fde6c094e0ae0c SHA512 0f1e96ee2a38f366ac583d7bb7426d409d11d428ba473ae3706e6c8baddcc8e1f8b3f90da05083622f2c23cc3d02f0c707e26e9edfafc6f1a2d655a4eb13369a -DIST kjobwidgets-5.96.0.tar.xz 101704 BLAKE2B 98f647b2bc7266364c05f5e57ddefbb60b8a16260f83abac4b33d7819987b2083029c14d78e49f6cd1fd5e087a343b11893e30d45c496e345fe98d67465055b5 SHA512 17fb818efa4f241a3e8248b81ba16c3a879b0580eb3a33efc19983faa5b39959e0cb1032b9044e953accd13ad93c028bfc619c49b26076416f707e6ea9480510 DIST kjobwidgets-5.99.0.tar.xz 101840 BLAKE2B f6eea6fc2be7f989ae0fcc8573fbc1a7df68fb872050d99d3a41dd1be6443d1cd5c582ec8a38f5b12519c75b562ec17f4dc9c49b26ee18c97d01ea1f5fbd21db SHA512 b59fdf92bbe3d6591b4f896d08a367e01f863b317e6a9545a79a6622bf2d3833af6c2351437cdffcc276202922c4efbac92256389521a134397e88915ddc4160 EBUILD kjobwidgets-5.100.0.ebuild 785 BLAKE2B 01fe86006c7a442c6aa7ceb4d69f1bed8f62f214dafbba420612de055315253086274d883292af7762fddff339f77c2522b0e4f854a7d9ea86467caf754baccf SHA512 244098463a91e0e396b9f6473c974c70764c099d10e78018bc0b53fb73d357e6feac49b3d6f272195434b241ebe63c716a26de2fd5b7314d9f9298ce7d9e002d -EBUILD kjobwidgets-5.96.0-r1.ebuild 873 BLAKE2B 683718bbe4cf4a89720c3b8087b750d49d3ee7f64a65ed012544e6c3baa20bf6c9c8aed1c1e0d7a3a727ecc14dbc8b55b1763d3bd0e8cb0c027e4d1bbf9b0095 SHA512 1b0e2fa36adbaae67361037de49e6e9f13c99c4251e141e6f177d55fa0426061512c2a385dae2b3de33fd2d0a22146f977a5e3508484f9d55c5dd259c6dbe95c EBUILD kjobwidgets-5.99.0.ebuild 782 BLAKE2B 628fa68ba2350888594300972e73683e3153018749d850d395ecf746f45d776915c5102745c136f9ad88d4a0227b8bd38371ec175fa8fab989503b16f6370936 SHA512 a3efa63594fb5515b717c32c4f4400e04b4b5f170b4c6219cf11192a04b86d250ed573cb973329ccc0655baa83049755baef5150c0329d8d5e7b77e27580442b MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch b/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch deleted file mode 100644 index 463daf84f573..000000000000 --- a/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5aeba3f01ef8cdf723813cacdd29945328288663 Mon Sep 17 00:00:00 2001 -From: Michael Pyne <mpyne@kde.org> -Date: Sat, 2 Jul 2022 17:57:10 -0400 -Subject: [PATCH] ui-server: Fix crash by only re-registering live KJobs. - -This addresses a frequently-reported crash in the job tracker for -KUiServerV2 that occurs when attempting to re-register new job views for -active KJobs after a new UI server comes online. - -Although I have not been able to reproduce the crash myself, (by -attempting to use both long-lived and short-lived file transfers from -Dolphin and restarting plasmashell), inspection of the code shows that -it is possible for there to be deleted KJobs pointing to JobView objects -during some portions of the job tracker's lifetime. - -The current code deals with this in situations including DBus calls to -create a U/I view for a KJob (the KJob may terminate before the DBus -reply is received) and even a short delay that can be optionally -introduced (the KJob may terminate before the delay elapses). A -QPointer<KJob> is used as a guard in these situations, but there is no -similar guard for the re-registration code. - -In this case we cannot use QPointer<KJob> to guard the job's lifetime -because the KJob must be alive when the QPointer<KJob> is created, and -this crash occurs when the KJob is terminated. However the KJob's -destruction should lead to the unregisterJob() function being called, -which handles removing the terminated KJob from the map of job views -with only one exception, where instead the job view for the KJob has its -"terminated" pending status set. - -So the fix here checks for the "terminated" state in the same way as -performed in requestView(), and if the KJob is terminated, handles -requesting the job view to terminate the U/I and finally removing the -terminated KJob from the map of job views. - -By doing this, we avoid passing a deleted KJob to the registerJob() -function, which will attempt to dereference it and crash the -application. - -See also merge request !22 - -BUG:450325 ---- - src/kuiserverv2jobtracker.cpp | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/src/kuiserverv2jobtracker.cpp b/src/kuiserverv2jobtracker.cpp -index 737c880..3592618 100644 ---- a/src/kuiserverv2jobtracker.cpp -+++ b/src/kuiserverv2jobtracker.cpp -@@ -209,12 +209,24 @@ void KUiServerV2JobTracker::registerJob(KJob *job) - - const auto oldState = view.currentState; - -- delete view.jobView; -- d->jobViews.remove(job); -+ // It is possible that the KJob has been deleted already so do not -+ // use or deference if marked as terminated -+ if (oldState.value(QStringLiteral("terminated")).toBool()) { -+ const uint errorCode = oldState.value(QStringLiteral("errorCode")).toUInt(); -+ const QString errorMessage = oldState.value(QStringLiteral("errorMessage")).toString(); - -- registerJob(job); -+ view.jobView->terminate(errorCode, errorMessage, QVariantMap() /*hints*/); - -- d->jobViews[job].currentState = oldState; -+ delete view.jobView; -+ d->jobViews.remove(job); -+ } else { -+ delete view.jobView; -+ d->jobViews.remove(job); // must happen before registerJob -+ -+ registerJob(job); -+ -+ d->jobViews[job].currentState = oldState; -+ } - } - }); - } --- -GitLab - diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild deleted file mode 100644 index dac768b0689e..000000000000 --- a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libX11 - ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-ui-server-crash.patch" ) # KDE-bug 450325 - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} |