gentoo resync 31.01.2019

3 files changed, 135 insertions, 0 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 2073a8318c2c..dc59703677cd 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
+AUX kxmlgui-5.54.0-kcheckaccelerators.patch 2830 BLAKE2B 0b2efb47f00c14da7b2e4cde06129f6c3d39aa7232908521458b5e09aaa3564c7ed8bae5ba383f587db27f154d7685e918318ed8db2145fa3f3634483503f562 SHA512 5f960842be0f2d4a5fbac8f08af49ce8c1247b152b96feecbfdfface3039a38dbf17bf4f0f584ff6956d842e9bfdb9884db7651a636c01bb872b279ed2dd5222
 DIST kxmlgui-5.52.0.tar.xz 868824 BLAKE2B b83639a9e5fb7fc3f841f943636f51860350b4f9e45864b60835a44e6a61412149a9702db70abd30a33af439a0e13f09a4cbbdab094875543d906042fd41cb0c SHA512 cad39799e4649a6607ba6f10928c02e68d6e7c9420b4f401fcb55fa10a7b74a2304ba226680fb50fa674207b10e9dec0fcba7233e74e514c7dbac5df4a020f8b
 DIST kxmlgui-5.54.0.tar.xz 869308 BLAKE2B f9f19452444074e2ce78f7a8c902b9703e0532974659ac5a34898debe52cd6dd05752c4923a9d1afe9606e628cb696ff59f0a5b78ad6d13f75c077b9bbde35e9 SHA512 bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5
 EBUILD kxmlgui-5.52.0.ebuild 1221 BLAKE2B acdaccd9ec7f22fda28b1d27ed9821184a1554a28c0e5df772aa9242203bda66edc342defb7cd60b3a2cc1fb07ddbd46c09930eafdc881d230ef2db710e6e453 SHA512 bac10638129d1cff3b7653bb25a4b4f87bbd0ce43e8dd5f192979da6626134b7cbd95ff08d4f0be364f984054e8fe8260d5f986af28df8e040de3324c29f2d75
+EBUILD kxmlgui-5.54.0-r1.ebuild 1280 BLAKE2B 7a3235a3cf0257ff3a17cccda56bc141cb993bbcf13cb9a7f992001076ebe6e9367fac427492312583ed92c587d74103a54c65fe565b9026a7165b7ab58926b3 SHA512 c5afae446c6a321bd1d0a584dfb1840757ff76767c018d951bf0867b0f03f1e761825bbf2d535741b9a6ba3c8df36d7aa3c99c1d0937cc4e7f88cb58240e949a
 EBUILD kxmlgui-5.54.0.ebuild 1223 BLAKE2B 899515fee4a20f349a0b5b635201af4595078c4555ebaa71d3f290907104bb5cd05e288ad757e67a16de151f4b71f5d0019611cdab4712c33261eddd6f8021a1 SHA512 90bc5dce670864cb90373e5110988a406f83c07cda34a9c688bff2e4f1598d3705554ea87debbebd037855582b98f44c0bbd0f984d581cc5caa3db1f96b658e2
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
new file mode 100644
index 000000000000..0882d5f09f9c
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
@@ -0,0 +1,79 @@
+From 02b523bad09aab062355e46771889b0f3709692f Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 12 Jan 2019 18:39:33 +0100
+Subject: Make KCheckAccelerators less invasive for apps that don't directly
+ link to KXmlGui
+
+Summary: BUGS: 337491
+
+Test Plan:
+Ran qtcreator and it no longer has the & in Details
+Added some debug and checked that okular still gets the code called
+
+Reviewers: anthonyfieroni
+
+Reviewed By: anthonyfieroni
+
+Subscribers: davidedmundson, anthonyfieroni, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D18204
+---
+ src/kcheckaccelerators.cpp | 38 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/src/kcheckaccelerators.cpp b/src/kcheckaccelerators.cpp
+index 13fc012..e08447d 100644
+--- a/src/kcheckaccelerators.cpp
++++ b/src/kcheckaccelerators.cpp
+@@ -80,10 +80,44 @@ public Q_SLOTS:
+ 
+ static void startupFunc()
+ {
+-    // Call initiateIfNeeded once we're in the event loop
+-    // This is to prevent using KSharedConfig before main() can set the app name
++    // Static because in some cases this is called multiple times
++    // but if an application had any of the bad cases we always want
++    // to skip the check
++    static bool doCheckAccelerators = true;
++
++    if (!doCheckAccelerators) {
++        return;
++    }
++
+     QCoreApplication *app = QCoreApplication::instance();
++    if (!app) {
++        // We're being loaded by something that doesn't have a QCoreApplication
++        // this would probably crash at some later point since we do use qApp->
++        // quite a lot, so skip the magic
++        doCheckAccelerators = false;
++        return;
++    }
++
++    if (!QCoreApplication::startingUp()) {
++        // If the app has already started, this means we're not being run as part of
++        // qt_call_pre_routines, which most probably means that we're being run as part
++        // of KXmlGui being loaded as part of some plugin of the app, so don't
++        // do any magic
++        doCheckAccelerators = false;
++        return;
++    }
++
++    if (!QCoreApplication::eventDispatcher()) {
++        // We are called with event dispatcher being null when KXmlGui is being loaded
++        // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular)
++        // For apps that don't link directly to KXmlGui do not do the accelerator magic
++        doCheckAccelerators = false;
++        return;
++    }
++
+     KCheckAcceleratorsInitializer *initializer = new KCheckAcceleratorsInitializer(app);
++    // Call initiateIfNeeded once we're in the event loop
++    // This is to prevent using KSharedConfig before main() can set the app name
+     QMetaObject::invokeMethod(initializer, "initiateIfNeeded", Qt::QueuedConnection);
+ }
+ 
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..eac5c3cc9e21
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kcheckaccelerators.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}