gentoo resync : 21.07.2018

3 files changed, 88 insertions, 0 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index aadf0e101a72..0afc352aac23 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
+AUX kxmlgui-5.48.0-kmainwindow.patch 1179 BLAKE2B fe0e9ef0c93f8ee5be95c0d25915585e9564f231e2394dc6c695ebfb89b2b0330ec65930dd8ca3d643e92742b2c3493e0b1f7cbc470d68cb81c738f4b9f54367 SHA512 f0b1b5e74f88f7dd36cd30bb049adcbe6da24edb8f41331e891ef9ce6772a49f842beb0fd53123d3358f3864911781a5f418c80bca1b1b22e5aae093b5fc6353
 DIST kxmlgui-5.46.0.tar.xz 884584 BLAKE2B d3beefcdf8ec6bd3e31d6a4a0b505725d7fbe9964f0d6eeefdbe6403b65ac7fd6e040da619fc4d6d87152ef1b6278a9dde34b7baae81a0835f66ba3a8d7e68ee SHA512 2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848
 DIST kxmlgui-5.48.0.tar.xz 883968 BLAKE2B 2f4577bfb8fb72f7083611b0777cb23d1dbe8078fabed527c6341458fc7833afab9c7de3a3b0454a80279ae6a8b7c8be78d4aba0dabf08a6197041a0a66afe99 SHA512 4f0bfac2f795fccc021cc139397e0691dfe9fa0a273ab8ad95783f4a415cd15c2f84dc5b0d80d0e37d92c7b884c3cb9f338fcf67964f89ac9d0d40cc6f6acef2
 EBUILD kxmlgui-5.46.0.ebuild 1204 BLAKE2B c536c6bb3c322e51761850249b03bb2eb010455e1c454f0e4aa365475b4d412652ca750c67c1f3dc5a0561cec51ba21f7257388a66ccdcb3e91dfd1ffdc3a656 SHA512 3cd83c1ab8c22a61ad297fb083e58646e6d1f638091642188266405cb0540b6130a1424afb71140abbf6d5a78d22b3adaabdc5ae4f6b04a5f102ed12f5227ee1
+EBUILD kxmlgui-5.48.0-r1.ebuild 1250 BLAKE2B d9a3296aca2c76f5c655b2b04e6af5717b51492ec2052f062f7f39b11fc6cd0dc6bb8fcf7e442f5b75d5610271c852253122670a4f20f3efc3acad001d926dbe SHA512 bf4a0b5a964549fb39ee5c811cfbd93a009129c7b2246552ca9ddd3c87d9ede167fb4f2bba7f61a9d46878bee5d44040e86edd9d7864ebec10c175ed034906c4
 EBUILD kxmlgui-5.48.0.ebuild 1200 BLAKE2B d5e4a352c281b0c379d2b65d23f3a34c24f4eb2c2687cbc2c5a13ca473492d73ee538e7b9930219d3a20674524a826e8928b4d75f6f58dd835e0cd3142a9b34c SHA512 3bdf9d9f0bc900ccb15b37796effe30d38bac165dff0ffeb206253688fc607d96f32f222a846b9c92f89bb95a206cde4bda51b2a75a2834d9199347c75ba92f4
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch
new file mode 100644
index 000000000000..ffc62a676d55
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch
@@ -0,0 +1,32 @@
+From d35a88289513c0420863b80aa6c1cb7d2c6e978f Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <max@scarlettvisionmedia.com>
+Date: Tue, 17 Jul 2018 09:45:30 +0200
+Subject: Fix KMainWindow saving incorrect widget settings
+
+BUG: 395988
+In certain cases KMainWindow::saveMainWindowSettings() could have been
+called after mainwindow started destroying itself. Window settings would
+be saved with incorrect child widget states. e.g. some widgets would be
+saved as hidden even if they were visible before destroying.
+---
+ src/kmainwindow.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index 810bf32..885ac60 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -524,6 +524,10 @@ void KMainWindow::closeEvent(QCloseEvent *e)
+     }
+ 
+     if (queryClose()) {
++        // widgets will start destroying themselves at this point and we don't
++        // want to save state anymore after this as it might be incorrect
++        d->autoSaveSettings = false;
++        d->letDirtySettings = false;
+         e->accept();
+     } else {
+         e->ignore();    //if the window should not be closed, don't close it
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild
new file mode 100644
index 000000000000..1bf6dd9dd26d
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}-kmainwindow.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bug: 650290
+	local myctestargs=(
+		-E "(kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}