commit: 7efccec23f297902e698925af2503519d58ddf45 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 22 21:28:56 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 22 21:59:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efccec2
kde-apps/konsole: (Final) fix(?) for window flashing on session close Upstream commit e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Tested-by: David Flogeras <dflogeras2 <AT> gmail.com> Bug: https://bugs.gentoo.org/807933 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ....3-default-navigation-be-TabbedNavigation.patch | 32 ++++++++++++++++++++++ ...le-21.08.1.ebuild => konsole-21.04.3-r4.ebuild} | 19 +++++++++++-- ...le-21.08.1.ebuild => konsole-21.08.1-r1.ebuild} | 4 +++ 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch new file mode 100644 index 00000000000..0eeaef37899 --- /dev/null +++ b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch @@ -0,0 +1,32 @@ +From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <[email protected]> +Date: Wed, 1 Sep 2021 11:38:29 +0200 +Subject: [PATCH] The default navigation method should be TabbedNavigation + +TabbedNavigation is when we have a MainWindow, i.e. the typical use case; +whereas NoNavigation is when using Konsole Part. The code in Part calls +setNavigationMethod(NoNavigation), so things should work as before. + +I made a wrong assumption that TabbedNavigation was already the default. + +CCBUG: 432077 +--- + src/ViewManager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp +index 2ba77e9f0..3ffbe6ba0 100644 +--- a/src/ViewManager.cpp ++++ b/src/ViewManager.cpp +@@ -52,7 +52,7 @@ ViewManager::ViewManager(QObject *parent, KActionCollection *collection) : + _pluggedController(nullptr), + _sessionMap(QHash<TerminalDisplay *, Session *>()), + _actionCollection(collection), +- _navigationMethod(NoNavigation), ++ _navigationMethod(TabbedNavigation), + _navigationVisibility(NavigationNotSet), + _managerId(0), + _terminalDisplayHistoryIndex(-1) +-- +GitLab + diff --git a/kde-apps/konsole/konsole-21.08.1.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild similarity index 77% copy from kde-apps/konsole/konsole-21.08.1.ebuild copy to kde-apps/konsole/konsole-21.04.3-r4.ebuild index 85e60971ebf..c44e2eb15d3 100644 --- a/kde-apps/konsole/konsole-21.08.1.ebuild +++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="true" -KFMIN=5.84.0 +KFMIN=5.80.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="X" DEPEND=" @@ -34,6 +34,7 @@ DEPEND=" >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 @@ -50,6 +51,18 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933 + "${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510 + "${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598 + "${FILESDIR}/${P}-default-navigation-be-TabbedNavigation.patch" # bug 807933 +) + +src_prepare() { + ecm_src_prepare + ecm_punt_bogus_dep KF5 Completion +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package X X11) diff --git a/kde-apps/konsole/konsole-21.08.1.ebuild b/kde-apps/konsole/konsole-21.08.1-r1.ebuild similarity index 94% rename from kde-apps/konsole/konsole-21.08.1.ebuild rename to kde-apps/konsole/konsole-21.08.1-r1.ebuild index 85e60971ebf..57a1100aff1 100644 --- a/kde-apps/konsole/konsole-21.08.1.ebuild +++ b/kde-apps/konsole/konsole-21.08.1-r1.ebuild @@ -50,6 +50,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-21.04.3-default-navigation-be-TabbedNavigation.patch" # bug 807933 +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package X X11)
