kde-apps/konsole: (Final) fix(?) for window flashing on session close

Upstream commit e693f2d7f1977ca227589154a5cd8c18d8ce44b7

Tested-by: David Flogeras <dflogeras2@gmail.com>
Bug: https://bugs.gentoo.org/807933
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

3 files changed, 117 insertions, 0 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 000000000000..0eeaef378990
--- /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 <a.samirh78@gmail.com>
+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.04.3-r4.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
new file mode 100644
index 000000000000..c44e2eb15d3b
--- /dev/null
+++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=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
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	X? ( x11-libs/libX11 )
+"
+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)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/konsole/konsole-21.08.1.ebuild b/kde-apps/konsole/konsole-21.08.1-r1.ebuild
index 85e60971ebfe..57a1100aff15 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)