6 files changed, 43 insertions, 4 deletions
diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/konsole
+++ b/source/kde/kde/build/konsole
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kscreen b/source/kde/kde/build/kscreen
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kscreen
+++ b/source/kde/kde/build/kscreen
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/libkscreen b/source/kde/kde/build/libkscreen
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/libkscreen
+++ b/source/kde/kde/build/libkscreen
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/plasma-nm b/source/kde/kde/build/plasma-nm
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/plasma-nm
+++ b/source/kde/kde/build/plasma-nm
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/konsole.patch b/source/kde/kde/patch/konsole.patch
new file mode 100644
index 000000000..99f44a3dd
--- /dev/null
+++ b/source/kde/kde/patch/konsole.patch
@@ -0,0 +1 @@
+cat $CWD/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch b/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
new file mode 100644
index 000000000..b34efb01f
--- /dev/null
+++ b/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
@@ -0,0 +1,38 @@
+From eb44240235fa61e662e9a521f72e8be9213bb536 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Mon, 3 Jan 2022 14:19:22 +0200
+Subject: [PATCH] Use tighter matching when finding the default profile file
+ name
+
+The code was checking if the path ended with a specific file name, which
+meant that if you have two profiles "Root Shell.profile" and
+"Shell.profile", the matching is messed up because the former ends with
+the latter. Instead since we're using the path, add a '/', this way we're
+matching the whole file name which is the last component in the path after
+the last '/'.
+
+Thanks to the bug reporter for git bisect'ing the repo to find the culprit
+commit.
+
+BUG: 447872
+FIXED_IN: 21.12.0
+---
+ src/profile/ProfileManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/profile/ProfileManager.cpp b/src/profile/ProfileManager.cpp
+index b19847074..18bc1dda8 100644
+--- a/src/profile/ProfileManager.cpp
++++ b/src/profile/ProfileManager.cpp
+@@ -206,7 +206,7 @@ void ProfileManager::loadAllProfiles(const QString &defaultProfileFileName)
+     const QStringList &paths = availableProfilePaths();
+     for (const QString &path : paths) {
+         Profile::Ptr profile = loadProfile(path);
+-        if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(defaultProfileFileName)) {
++        if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(QLatin1Char('/') + defaultProfileFileName)) {
+             _defaultProfile = profile;
+         }
+     }
+-- 
+GitLab
+