gentoo resync 31.01.2019

10 files changed, 390 insertions, 0 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 12bb56eb1bd8..826a6d7d990a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 46bb3fe2b6de..3e58f8653129 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,7 @@
+AUX ktexteditor-5.54.0-allow-change-marker-size.patch 2381 BLAKE2B 527cce76a6386196c5ac5558be893418886e1ac051a25e7fd091f90aa13031ac7687edf49b1cbbc31ba415773f82053af68ef15cfcdf2a7565aa3c5248372d7c SHA512 a1b6a72ad99ec246fbf2d74e57e8537f44b5e4adc197bde5060a6c8b29da295d198483f93a326720efbf3e0940a627da5c1d5e164469cc905fc081f642a5db90
 DIST ktexteditor-5.52.0.tar.xz 2251064 BLAKE2B f605b3fbcdaacb131587f1b8f4f9f9ece10c0a7fa55413ea210eacc5b28e2787461a5892524b383b4f4ae1c71a1dd1939d488d3d41b099e3157398ec180d480d SHA512 98442415124e4202d13ec99e84f9ff260bff959efdd7703555eecb74594c93125e83180fbb5527d216d5ef57da60055e89b48f331ddf0e2024f7686c78c6b7f0
 DIST ktexteditor-5.54.0.tar.xz 2264380 BLAKE2B 576176595c80b79f4bbe58e17304c7a9168be2723f01e7f1c51f67970bea9a9169084b074e754957c2e77c134df837226e85ff3b3a0a149005240520595de116 SHA512 8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500
 EBUILD ktexteditor-5.52.0.ebuild 1393 BLAKE2B 3c7fcd8fb2c151ffb9e3318ca158c2e49fffa87649001a5414bcde06e99f20a3af2c094568014d90696365ee6d82370234f69b683dbc7ef4c87a8a7c010adfba SHA512 3ff4074be64290ad4062723033b5174b3cf828d6c52580339fa123712e93b9bf5ddf448e28261cf6bda053770e8c071281c4d7fb3fd90bcd1df23d63c72d6333
+EBUILD ktexteditor-5.54.0-r1.ebuild 1458 BLAKE2B 987740c0160f99e310380f5dcc71dc8676d92eec8bd178f93d2b5db8581165edd775b67b93c6fded7c133c9434f1d8c5a22c07245d49ef6fd12e8bfe80c154f8 SHA512 42dac6270887b9a9a85fc405dc27a658512fbb428cf3d2e7c87a435290620988083f30a139546b744da8cd3ac8cc6aa6295f19caeddfdbca3c7226c7a9f97b8e
 EBUILD ktexteditor-5.54.0.ebuild 1395 BLAKE2B 5312d70dfa9ff4807aea72342db176460b9b622082808a6bff3ff372aad8d2c8a3b58daa3a78b71d847a69b2d774ad6fdd40d3c34c865bf27571fd92c371e473 SHA512 50f3b031102a7d59a1a5d0f8914b8bb1bf3bfbe758eb4865c7adf63f0006fc0dec00be009b6e54f7ade014348aeaf67ad4d3565a0defc96ff0778a0fb2e31eff
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
new file mode 100644
index 000000000000..032fbc99367e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
@@ -0,0 +1,78 @@
+From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Wed, 30 Jan 2019 17:16:32 +0100
+Subject: Fix bug 403422: Allow changing the marker size again
+
+This bug was introduced with https://phabricator.kde.org/D17661
+with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8
+
+FIXED-IN: 5.55
+BUG: 403422
+---
+ src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui
+index 02a0d54..cc44a39 100644
+--- a/src/dialogs/textareaappearanceconfigwidget.ui
++++ b/src/dialogs/textareaappearanceconfigwidget.ui
+@@ -185,10 +185,10 @@
+             <string>Size of the visible highlight marker.</string>
+            </property>
+            <property name="minimum">
+-            <number>-1</number>
++            <number>1</number>
+            </property>
+            <property name="maximum">
+-            <number>-1</number>
++            <number>5</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+@@ -301,6 +301,21 @@ beginning of a file.</string>
+    <header>kcombobox.h</header>
+   </customwidget>
+  </customwidgets>
++ <tabstops>
++  <tabstop>gbWordWrap</tabstop>
++  <tabstop>chkDynWrapAtStaticMarker</tabstop>
++  <tabstop>cmbDynamicWordWrapIndicator</tabstop>
++  <tabstop>sbDynamicWordWrapDepth</tabstop>
++  <tabstop>chkShowTabs</tabstop>
++  <tabstop>chkShowSpaces</tabstop>
++  <tabstop>sliSetMarkerSize</tabstop>
++  <tabstop>chkShowIndentationLines</tabstop>
++  <tabstop>chkShowWholeBracketExpression</tabstop>
++  <tabstop>chkAnimateBracketMatching</tabstop>
++  <tabstop>chkFoldFirstLine</tabstop>
++  <tabstop>chkShowWordCount</tabstop>
++  <tabstop>chkShowLineCount</tabstop>
++ </tabstops>
+  <resources/>
+  <connections>
+   <connection>
+@@ -314,8 +329,8 @@ beginning of a file.</string>
+      <y>7</y>
+     </hint>
+     <hint type="destinationlabel">
+-     <x>340</x>
+-     <y>44</y>
++     <x>559</x>
++     <y>117</y>
+     </hint>
+    </hints>
+   </connection>
+@@ -330,8 +345,8 @@ beginning of a file.</string>
+      <y>6</y>
+     </hint>
+     <hint type="destinationlabel">
+-     <x>385</x>
+-     <y>72</y>
++     <x>559</x>
++     <y>162</y>
+     </hint>
+    </hints>
+   </connection>
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..72fcd5e12613
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 0bda9322a14b..d68c798ec9b1 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,7 @@
+AUX kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch 2896 BLAKE2B 0e19645ee2543003f1e6d6f68461695451e37986abc3f68fc518c69622fed24232461f2cf8ddbae6f84e3112619482f340e0e0addc863448ad3d65f8810cede3 SHA512 3e33aca5dddbdefee8d048d1413955eeaf93137192ddabb21f933c7971ad919beaa3ebc6dc00c11fa47cac19de9a552ce097f2cf308796c2ade7b2329a4984aa
 DIST kwidgetsaddons-5.52.0.tar.xz 2185380 BLAKE2B 6307774cc9d6c41d45b9c5fc97a2c72d52065970dee54f6871df49f5f8ce9ffcb62277eef031466ed7ced83ad6941de61f424d03affff00111dcbada24a7ceb0 SHA512 86f2f32ab3071358c6d2887fcf0105a3d84d60e2e58898a48857776cc42e0a2c45d53d786879449fed79fd86dd58b2a9ae2053b7b254fb3590222e915e533cd3
 DIST kwidgetsaddons-5.54.0.tar.xz 2187048 BLAKE2B fba80432f00154ed4811d70b693d13d3dfee5c5dcebd3a3c8b3403ed5119e0289f10efdb8579be302ae2c2b6bb17853f20ac4c337fe78dbe042ee2cace00f8a4 SHA512 e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8
 EBUILD kwidgetsaddons-5.52.0.ebuild 522 BLAKE2B 0875eb8feea99bfe3e18fc121d3fa3b457ef62351959926c50cd16cf0f9629087c89e7940f56e6c1ed4d446d66db434b37797c76a2992994bd34c81157d0c579 SHA512 d1abbc7350ed8ed8523e14f758bb714d88b83b84d56aa552e02c123c611a9d5a65149420442b80240513dcb9118bc903140eb2179ff884a659bc967dba71710e
+EBUILD kwidgetsaddons-5.54.0-r1.ebuild 590 BLAKE2B 61547b76e1be127fb6a1182d506364e0516c9db02065ebb988eb3ebdf7041ec05fe8561b318fbbbc70c09451eeea2f166665da598f721f8a01395d3b1758af5f SHA512 9a57345c5d58b0bbdf11e227bfe04fd25cc26e42ed1a0875f6da29292a7f5db15434710bb53f71333560c6fa26c8f02ad2390866d1d5b2b0e2d4e034271e6f5d
 EBUILD kwidgetsaddons-5.54.0.ebuild 524 BLAKE2B 84db784a57f04cbd14d04a502ac416314dfa8e42996e2c111d0ab450cda4c00bd5c2be770f3413733b8b15c556bafb2167922f8df03ed171fbaff8628c5525f8 SHA512 2036f8a1d36b67a09e1b882cf34ec3fb4e2a46a5eff3d6588adcd2d37c9bdf2d2dae548109d417fbbe4017d7ba93f2ab9c9d004eba1ff32cc4c8ae8173f49ba6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
new file mode 100644
index 000000000000..38c89728b52e
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
@@ -0,0 +1,88 @@
+From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
+Date: Thu, 10 Jan 2019 09:19:33 -0700
+Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3)
+
+Summary:
+This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility.
+
+CCBUG: 402730
+
+FIXED-IN: 5.54
+
+Test Plan:
+Before:
+{F6520054}
+After:
+{F6520058}
+
+Reviewers: ngraham, #frameworks, #vdg, #plasma
+
+Reviewed By: ngraham, #vdg
+
+Subscribers: cfeck, filipf, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17907
+---
+ src/ktitlewidget.cpp | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp
+index 7a34bc2..d8b0517 100644
+--- a/src/ktitlewidget.cpp
++++ b/src/ktitlewidget.cpp
+@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e)
+     if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange
+                                            || e->type() == QEvent::ApplicationFontChange) {
+         d->textLabel->setStyleSheet(d->textStyleSheet());
+-        //Qt stylesheet doesn't support lighter font-weight
+-        QFont font(d->textLabel->font());
+-        if (d->level <= 4) {
+-            font.setWeight(QFont::Light);
+-            font.setStyleName(QStringLiteral("Light"));
+-        } else {
+-            font.setWeight(QFont::Normal);
+-            font.setStyleName(QStringLiteral("Regular"));
+-        }
+-        d->textLabel->setFont(font);
+         d->commentLabel->setStyleSheet(d->commentStyleSheet());
+     }
+ }
+@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment)
+ 
+     if (!Qt::mightBeRichText(text)) {
+         d->textLabel->setStyleSheet(d->textStyleSheet());
+-        //Qt stylesheet doesn't support lighter font-weight
+-        QFont font(d->textLabel->font());
+-        if (d->level <= 4) {
+-            font.setWeight(QFont::Light);
+-            font.setStyleName(QStringLiteral("Light"));
+-        } else {
+-            font.setWeight(QFont::Normal);
+-            font.setStyleName(QStringLiteral("Regular"));
+-        }
+-        d->textLabel->setFont(font);
+     }
+ 
+     d->textLabel->setText(text);
+@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level)
+     d->level = level;
+ 
+     d->textLabel->setStyleSheet(d->textStyleSheet());
+-    //Qt stylesheet doesn't support lighter font-weight
+-    QFont font(d->textLabel->font());
+-    if (d->level <= 4) {
+-        font.setWeight(QFont::Light);
+-        font.setStyleName(QStringLiteral("Light"));
+-    } else {
+-        font.setWeight(QFont::Normal);
+-        font.setStyleName(QStringLiteral("Regular"));
+-    }
+ }
+ 
+ int KTitleWidget::level()
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..274e1794131f
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" )
+
+src_test() {
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
+	kde5_src_test
+}
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
+}