diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-28 23:13:50 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-28 23:20:48 +0200 |
commit | 4461ffbf581738fbf48fe1ed744ead6885d93dda (patch) | |
tree | de205c455262e9f04e26c52e9327ceb1a65ff4b6 /kde-frameworks/kglobalaccel | |
parent | sys-fs/encfs: Drop 1.9.2 and 1.9.4 (diff) | |
download | gentoo-4461ffbf581738fbf48fe1ed744ead6885d93dda.tar.gz gentoo-4461ffbf581738fbf48fe1ed744ead6885d93dda.tar.bz2 gentoo-4461ffbf581738fbf48fe1ed744ead6885d93dda.zip |
kde-frameworks: Drop KDE Frameworks 5.57.0
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kglobalaccel')
4 files changed, 0 insertions, 116 deletions
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest index 07fe101f76b7..62cac098f14f 100644 --- a/kde-frameworks/kglobalaccel/Manifest +++ b/kde-frameworks/kglobalaccel/Manifest @@ -1,2 +1 @@ -DIST kglobalaccel-5.57.0.tar.xz 84148 BLAKE2B 2dfbab1efbf652dc425f50ff035378c4bf8850e51df70ed7513d65344a95beb4267c5655ce7d5d9a4f6bca5b91c60dfd272750e92a2725f2cda17a831d072ab3 SHA512 26bdbfa6ec61831db7c4b539f4ca93bea397c607fa4d8f047a6166e8e69555443ef96a75331ab40a871ab3c450fa6996c2697888be38d191b0e6c43c0b54650c DIST kglobalaccel-5.60.0.tar.xz 84060 BLAKE2B 7387c67ac8906669404e0af171e3ca253f580f6b531144caf09cc5743d1b0fb839888a89b895871c5775a46b8c32622c2cbc5c6eeeca80ea73780491df5eba96 SHA512 caf89a31b332fec6f78a68b65c66c72658d9eb595f322155cae01acad4853e612264f75ba8993702e4541a89c6d59c2e16fd4db2cc53487f8e3aa42a869a4901 diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix.patch deleted file mode 100644 index 762623d6d4f1..000000000000 --- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From abe32ec599397bda0ce73471519410bee2c16059 Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Sun, 14 Apr 2019 20:15:31 +0200 -Subject: Don't use qAsConst over a temporary variable - -Summary: BUG: 406426 - -Reviewers: dfaure - -Reviewed By: dfaure - -Subscribers: kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D20555 ---- - src/runtime/component.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/component.cpp b/src/runtime/component.cpp -index ce276b9..669df67 100644 ---- a/src/runtime/component.cpp -+++ b/src/runtime/component.cpp -@@ -330,7 +330,8 @@ bool Component::isShortcutAvailable( - // context - if (component==uniqueName()) - { -- for (GlobalShortcut *sc : qAsConst(shortcutContext(context)->_actions)) -+ const auto actions = shortcutContext(context)->_actions; -+ for (GlobalShortcut *sc : actions) - { - if (sc->keys().contains(key)) return false; - } --- -cgit v1.1 diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix1.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix1.patch deleted file mode 100644 index 68a76d5f00e7..000000000000 --- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.57.0-runtime-crashfix1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 78a711361db3a5156f511eab89ff7ebbc86b9125 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Thu, 18 Apr 2019 14:32:11 +0200 -Subject: Copy container in Component::cleanUp before interating - -Summary: -Crash was reported: - -Thread 1 (Thread 0x7fdc95c68800 (LWP 6402)): -[KCrash Handler] -#6 QHashData::nextNode (node=node@entry=0x562f53ffbd10) at tools/qhash.cpp:598 -#7 0x00007fdc95a1fbab in QHash<QString, GlobalShortcut*>::const_iterator::operator++ (this=<synthetic pointer>) at /usr/include/x86_64-linux-gnu/qt5/QtCore/qhash.h:395 -#8 KdeDGlobalAccel::Component::cleanUp (this=0x562f53ffb040) at ./src/runtime/component.cpp:163 - -Apparently the container is modified while iterating over it. That does not work with the range-for as it does not detach, as opposed to Q_FOREACH. - -Test Plan: @lbeltrame saw valgrind errors before applying this, but those disappeared with this patch. - -Reviewers: #frameworks, davidedmundson - -Reviewed By: davidedmundson - -Subscribers: lbeltrame, kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D20659 ---- - src/runtime/component.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletion(-) - -diff --git a/src/runtime/component.cpp b/src/runtime/component.cpp ---- b/src/runtime/component.cpp -+++ b/src/runtime/component.cpp -@@ -158,9 +158,10 @@ - - bool Component::cleanUp() - { -- bool changed = false;; -+ bool changed = false; - -- for (GlobalShortcut *shortcut : qAsConst(_current->_actions)) -+ const auto actions = _current->_actions; -+ for (GlobalShortcut *shortcut : actions) - { - qCDebug(KGLOBALACCELD) << _current->_actions.size(); - if (!shortcut->isPresent()) diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild deleted file mode 100644 index 698fc1264813..000000000000 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework to handle global shortcuts" -KEYWORDS="amd64 ~arm arm64 x86" -LICENSE="LGPL-2+" -IUSE="nls" - -BDEPEND=" - nls? ( $(add_qt_dep linguist-tools) ) -" -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kwindowsystem X) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libxcb - x11-libs/xcb-util-keysyms -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-runtime-crashfix{,1}.patch ) |