commit: 8eca89a494294f5923ff4c62e1d2723ea02998dc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 18 18:32:12 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 18 18:46:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eca89a4
kde-frameworks/kxmlgui: KMainWindow saving incorrect widget settings KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=395988 See also: https://phabricator.kde.org/D13808 Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch | 32 +++++++++++++ kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild | 54 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) 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 00000000000..ffc62a676d5 --- /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 <[email protected]> +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 00000000000..1bf6dd9dd26 --- /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 +}
