5 files changed, 85 insertions, 4 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 715118c04970..b2a66dcb9132 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index d992d67e26d7..ac4ccf27ff61 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,10 +1,11 @@
+AUX konsole-21.04.3-dont-close-window-while-split.patch 2592 BLAKE2B 22c438734d6e3959f965b54dd76fc683566ed17ef8d368984c5d54b9ec6f95612ab2c993f1266367933b2327e937164eb655d386dce9cd82178f229a136c5789 SHA512 641eb0010bd320868538ebb3254e5883b84e4e17d06bd0ddea961e49b00eb3f811c0a163fc50096ac4d194a53a22db5ad9d3b6c007a85a40299eab03f36ba394
 AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e
 AUX konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch 2818 BLAKE2B f8b8f3c9a5d709d8318e4e8a7e29eb74fde3106e2f50abeac4b535147d4fb2cc685a70e0609b1035e19c1b92aa9d4efd202b5a8b743ac32ec7a760091b41337c SHA512 18ae7cd7a52ddbe3ee1eb5899f2f177d126b7d3aa7ca030fc32abfbc13ad2bd6e76dbd9135c529f352814b474be8fbda23ff1ec563b66d12e6026681a8e440be
 AUX konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch 3076 BLAKE2B c84ec4cf530973bf5eeff173a8a1f0f0e833229bd9f01f83ea658357d2fbd852923824234f0650ec485be2f3062730bfa401e7eab8569ea04e6bfe9c98f8a964 SHA512 4703e6282884e093d38cb9071fbe9b083d7b986632a3eb26fddc5bac180f92412e5fef82c1caaedf1feefefcc9df3fab30ef4cb79b254611a57b52b5eaa0bfc1
 AUX konsole-21.08.0-fix-crash-w-blur.patch 1613 BLAKE2B f4a54da701a24031f5a530896b6b4861bd90c0b4f6be9a32046582187da8dc35752e768a9f05e3492f6174990ef371a7570d556cf3e135a4c73049491d369e92 SHA512 fd600b7c3752364c311c727461627b6183e31084b5af36768f7ff2b84e024494b5ec1121202184e2301cbff72549fb99dd8c2475f749ce440ec6192ba70eed15
 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 DIST konsole-21.08.0.tar.xz 1373652 BLAKE2B 52661bf8296cb1f64b065f32d0d6a7d4bcf689a45e54c18165b5d4bf6893b7312daa6b45418b9142042154801b34e22388d04998af7d406fed53ab20073dcc11 SHA512 7b59b43e1dd1374001570c7bc611c00c7de738cdf7030954173a8d5b901412cb5653616c12f0b85af38a48e3598bf64d6bce9ca068b520a6683f5fb7bac3c38f
-EBUILD konsole-21.04.3-r1.ebuild 1876 BLAKE2B 42e78abae3fe19c1f7fcaf1bfeca2598f8d0154702cb23b366450482c3e4d3c4d9ff35e88b4c927b1433e6c87df71ca85297364baed3765d307986856fc4f462 SHA512 42ad313c1a56514934ece7efaf1a6c682eafa06e5cd9906188e4ef7c1aafb4333d0630f3b45fe9b9afd3aa05c57c98d755209e7e5645a32fc0f194873da71f6c
+EBUILD konsole-21.04.3-r2.ebuild 1944 BLAKE2B 8e6d9258327dbf326a78f273de429468319198dc222c7152dbdb67833b198dac3324f16b7e06f6fe6bacbc785b531a47e79481940594334dbd5c930fab47ccb7 SHA512 b649a9b9aed3201db1cb6f5b4ef30c9487c8a55aa5d220472ba526a14a616876913326b16ca7429b3c2cf477e6329d32f5124fb87b7340e138593ea46e54b8d8
 EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991
-EBUILD konsole-21.08.0-r3.ebuild 2025 BLAKE2B cfbd472fe689ffb0615360df13ffb30f09cd789e5393a1fd920857c63374ec6f27d3d2b100ba23437827be16bc059879686322d35dfe3408a3bad6f24e65a02e SHA512 788a7af8cfb4a6ba647631d5f5bd41f8c3add0f36847d35816298b7f40f8cee9f59dcc3b0206c087bcdae1d99a72d92646e5b29bb8040f0ea6133df21c31be74
+EBUILD konsole-21.08.0-r4.ebuild 2103 BLAKE2B fef690ac0acd9a048558fadda69f81e31fa3cf49eac4d80313f02ae3c986d0661b1ffa13982d74e5467dbe2fdde680d5afca1b96fe7d9094705c5045c6f34a04 SHA512 c6aad12645884d602d1f76db0259a0b137e637a574e6e947c952020bfb067af40243eab461cac1ae18a3ab60da21b247ad4ce0a5dd9716352b07178ed182003e
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
new file mode 100644
index 000000000000..20762b109574
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
@@ -0,0 +1,76 @@
+From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sun, 15 Aug 2021 15:51:33 +0200
+Subject: [PATCH] When closing a session, don't close the whole window if there
+ are splits
+
+When closing a session, we check if that is the last tab, and make the code
+close the whole window, but we also need to make sure it's the last view,
+i.e. no split views.
+
+CCBUG: 440976
+FIXED-IN: 21.08.1
+(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e)
+---
+ src/ViewManager.cpp           | 6 +++---
+ src/widgets/ViewContainer.cpp | 9 +++++++++
+ src/widgets/ViewContainer.h   | 6 ++++++
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 9c006e2bd..426040b78 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -494,9 +494,9 @@ void ViewManager::sessionFinished()
+         return;
+     }
+ 
+-    // The last session/tab? emit empty() so that close() is called in
+-    // MainWindow, fixes #432077
+-    if (_viewContainer->count() == 1) {
++    // The last session/tab, and only one view (no splits), emit empty()
++    // so that close() is called in MainWindow, fixes #432077
++    if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
+         Q_EMIT empty();
+         return;
+     }
+diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp
+index 2d7bfd13b..b25c00cdd 100644
+--- a/src/widgets/ViewContainer.cpp
++++ b/src/widgets/ViewContainer.cpp
+@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int index)
+     return qobject_cast<ViewSplitter*>(widget(index));
+ }
+ 
++int TabbedViewContainer::currentTabViewCount()
++{
++    if (auto *splitter = activeViewSplitter()) {
++        return splitter->findChildren<TerminalDisplay*>().count();
++    }
++
++    return 1;
++}
++
+ void TabbedViewContainer::moveTabToWindow(int index, QWidget *window)
+ {
+     auto splitter = viewSplitterAt(index);
+diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h
+index 3cbacf2cf..8e0a0986a 100644
+--- a/src/widgets/ViewContainer.h
++++ b/src/widgets/ViewContainer.h
+@@ -135,6 +135,12 @@ public:
+      */
+     ViewSplitter *viewSplitterAt(int index);
+ 
++    /**
++     * Returns the number of split views (i.e. TerminalDisplay widgets)
++     * in this tab; if there are no split views, 1 is returned.
++     */
++    int currentTabViewCount();
++
+     void connectTerminalDisplay(TerminalDisplay *display);
+     void disconnectTerminalDisplay(TerminalDisplay *display);
+     void moveTabLeft();
+-- 
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
index eb5601c28fcf..c95192f968c4 100644
--- a/kde-apps/konsole/konsole-21.04.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
@@ -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 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
@@ -51,7 +51,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no-flash-on-session-close.patch" ) # bug 807933
+PATCHES=(
+	"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
+	"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+)
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/konsole/konsole-21.08.0-r3.ebuild b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
index fe8cab4b97f8..d4600f096a87 100644
--- a/kde-apps/konsole/konsole-21.08.0-r3.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
+	"${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 808510
 	"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
 	"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
 	"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791