gentoo resync : 02.08.2019

5 files changed, 2 insertions, 121 deletions

diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 7eaadd01ac99..b3c22b30bfcb 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,7 +1,3 @@
-AUX kglobalaccel-5.57.0-runtime-crashfix.patch 1035 BLAKE2B d21b9f91b8f063ddbcfc15191e86984caa5356018fc465605fb36fa0db236eab8c47d2661e81596589922a2e445115818ddf8a3c66c3b576a05cd993ccc1c1cb SHA512 021addb64df64c2f474037be45796abdbd9d9078ce355457e101324987d4a5238d80d3702500b33b497710f7f5e974ba5d288770432c3d139b77212128b3697d
-AUX kglobalaccel-5.57.0-runtime-crashfix1.patch 1704 BLAKE2B 15ba3b0c39e9d1da36733673796126e55eb3cace7a43944d10e8e30c42a24390fe662d30dec5cc75357ea1e12d413cedd4cc43377b8f0fe18afc81509572ee53 SHA512 95e2ea355b3a260ea080b700e68d6f7a67b7f394f0d085450ae9ee31d09240377f4a346f7cc26db34868f22c75b65082a0a40c1999e6b2a4d4eab83be3aa0c4d
-DIST kglobalaccel-5.57.0.tar.xz 84148 BLAKE2B 2dfbab1efbf652dc425f50ff035378c4bf8850e51df70ed7513d65344a95beb4267c5655ce7d5d9a4f6bca5b91c60dfd272750e92a2725f2cda17a831d072ab3 SHA512 26bdbfa6ec61831db7c4b539f4ca93bea397c607fa4d8f047a6166e8e69555443ef96a75331ab40a871ab3c450fa6996c2697888be38d191b0e6c43c0b54650c
 DIST kglobalaccel-5.60.0.tar.xz 84060 BLAKE2B 7387c67ac8906669404e0af171e3ca253f580f6b531144caf09cc5743d1b0fb839888a89b895871c5775a46b8c32622c2cbc5c6eeeca80ea73780491df5eba96 SHA512 caf89a31b332fec6f78a68b65c66c72658d9eb595f322155cae01acad4853e612264f75ba8993702e4541a89c6d59c2e16fd4db2cc53487f8e3aa42a869a4901
-EBUILD kglobalaccel-5.57.0-r2.ebuild 715 BLAKE2B 62643a9cf5f12bfce97ff7846c9d61bf986e945609c3eea466046e55f6b9f20f34a82a096a153132caa423e27282bcb93673ce9ae64f7f5edff3f128705778f0 SHA512 608801b7a945d0769611e62bcbf3a0890323b1a4d7044a74fff636d74e3a9bafa49f925755b36f37d97ac2e8129c782f94f6e729d5046187dbf01d5ae93579d9
-EBUILD kglobalaccel-5.60.0.ebuild 659 BLAKE2B 8984b5c7453e970ec7655a4f9d668bb1cdc52c4aa5c7502a02e9f8844d24056a4f9130d265cc09df1aac5d9296d9f51ab3a56b1a57598a4f90ca15121a35aa8d SHA512 47e98ef6615ec2ec8fa691016b1404d94a70af9d87a68fa024f2321375b98c0a56100df4a1f0b63e78e5e1c4e8d3a9952accff365389d6bbdfa2842410dc7aa0
+EBUILD kglobalaccel-5.60.0.ebuild 656 BLAKE2B deb6b155af8b5112378f26b19f3e2815e802abc84ca21805244463d62b77f5549f022a1c24adbbd47a2b5f8fa0fa259b48734ea0dabf99692679e8888a6baf09 SHA512 4ed0642209e81ad3c349d10ee9e34e5e043fa85348853c134887dab9382aa02f706edc0ccf41bd7076f7d9733404a337c90b117e0c17636b5c07c32b67fbc0b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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 )
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.60.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.60.0.ebuild
index 3b20c7929f30..b1a56c24fc3d 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.60.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.60.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="nls"