gentoo resync : 30.09.2020

3 files changed, 72 insertions, 1 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index a625b5667e35..7d84efd4d19c 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,6 @@
+AUX kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch 2160 BLAKE2B c467d71f6ce8d24f90aa29192e1f19d10ff8c2d290a1695259e93fb90b1f0d77ed46a2346599c8c5a540a406c55ef68a3fe8cf9b8fe40bcbdb8cca9f113df755 SHA512 4188f192ac437f6334d261f8f178dd2ca29d2ea48fa4d51e23483b2212369ee79521f098a9a51e8e8ac1ec0f861b76a96fefe5a1620149102d2d9268ca794cb3
 DIST kxmlgui-5.70.0.tar.xz 857852 BLAKE2B 7908b175c34761832dfa835ec96978ab2c107263f0e358074b2d26ce54f8eb71236f65bfac5be480bc3f487f854d1de2843ecfc757e0417b4378b67c866f7863 SHA512 d50394c42bf494d70acab91f77817e96fb76efcf1f15af2a17dd027a175d87ea27778756124c15dd104278773f74c9a1d2fca7f0671b12adcd9851532a0958e2
 DIST kxmlgui-5.74.0.tar.xz 864784 BLAKE2B d6cc88603f0036415981411bbaeca6ba7877df085d5b5095b04b7d5567d0e1f23ad3d8c8b1472a365018e9360ee4351c7523fd791d4e53ecca3e9143cc8f2b72 SHA512 98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92
 EBUILD kxmlgui-5.70.0.ebuild 1285 BLAKE2B 4017f3fb0eab9abf2d9e049c0b3d3050d37e886f4a6d8a9fc09874dc72c6f30ca9b398be7e120e86e56361eb9bbadaead4e9dc7883ecbc6f026292c98fb2d7bf SHA512 4e363d9b13c5b6f6e80ad26e80c486040ba649da079a3f6e87276a4a7546912e3c06a4f669368d849c1853ae791e869c4c6ccff87715d3d4396762859301bd53
-EBUILD kxmlgui-5.74.0.ebuild 1288 BLAKE2B 5e44c255d4fc9af7bffcd8111ae506b9ac0bc209d01b7aeec1d01a5e48646babcdc36aa954448b16fd5e24764cdd3a590ac9f59aeb470cac994db4691f52f7e9 SHA512 4ddbc5d9bf270f33a92bf52f1dbc05ae97ea1d18c6eab15fd08a1048eb3ed527e3733a8a594c9a7ac684a763b8750771a531ead695abc649bf4ff413ae102a5d
+EBUILD kxmlgui-5.74.0-r1.ebuild 1360 BLAKE2B b932a130e9863f04bc5e36539366eb88d67cabc4e725f5c85c9aadf8d7be494bebe1227ac22e9d915ad0b8efa9ab1250655e707808de29ed3e37a4d977aa3fd0 SHA512 166c3dcadd074b384a140d6dd51b8e1d48d6062306434fe2a041e80dd9ed2e526a175d740dd7192a91923fceaf1eeeb7849bdb4e19b4bfb514ca378e5ff75f1a
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch
new file mode 100644
index 000000000000..f49999eb6490
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch
@@ -0,0 +1,68 @@
+From 7cefdcf3d04669978aa28481d8ea274402935374 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Mon, 10 Aug 2020 09:54:14 +0200
+Subject: [PATCH] Handle double close in main window
+
+After a bug fix in Qt 5.14 we now get real close events for unclosed windows
+when the application closes, so we would be getting two close events breaking
+our logic when when to suppress on-close dialogs.
+
+Suppress the real close event after we have handled our own simulated one. Also
+works if there is no real close event.
+
+BUG: 416728
+
+* Fixup after git merged the wrong commit
+---
+ src/kmainwindow.cpp | 8 ++++++++
+ src/kmainwindow_p.h | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index b9bc2b6..33babb9 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -269,6 +269,7 @@ void KMainWindowPrivate::init(KMainWindow *_q)
+     letDirtySettings = true;
+ 
+     sizeApplied = false;
++    suppressCloseEvent = false;
+ }
+ 
+ static bool endsWithHashNumber(const QString &s)
+@@ -532,6 +533,10 @@ void KMainWindow::appHelpActivated()
+ void KMainWindow::closeEvent(QCloseEvent *e)
+ {
+     K_D(KMainWindow);
++    if (d->suppressCloseEvent) {
++        e->accept();
++        return;
++    }
+ 
+     // Save settings if auto-save is enabled, and settings have changed
+     if (d->settingsTimer && d->settingsTimer->isActive()) {
+@@ -556,6 +561,9 @@ void KMainWindow::closeEvent(QCloseEvent *e)
+     } else {
+         e->ignore();    //if the window should not be closed, don't close it
+     }
++    // If saving session, we are processing a fake close event, and might get the real one later.
++    if (e->isAccepted() && qApp->isSavingSession())
++        d->suppressCloseEvent = true;
+ }
+ 
+ bool KMainWindow::queryClose()
+diff --git a/src/kmainwindow_p.h b/src/kmainwindow_p.h
+index 13f6f19..bdd1eb4 100644
+--- a/src/kmainwindow_p.h
++++ b/src/kmainwindow_p.h
+@@ -33,6 +33,7 @@ public:
+     bool settingsDirty: 1;
+     bool autoSaveWindowSize: 1;
+     bool sizeApplied: 1;
++    bool suppressCloseEvent: 1;
+     KConfigGroup autoSaveGroup;
+     QTimer *settingsTimer;
+     QTimer *sizeTimer;
+-- 
+2.28.0
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
index 38761c0a0a10..04c5486ff737 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.74.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
@@ -35,6 +35,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-multiple-tabs-popup-on-logout.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON