From 6fbc9a91b0fd4f130b6ecea7e24cd2d7864d7e0c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:35:49 +0000
Subject: import kde-workspace-4.11.19-15.el7


---

diff --git a/SOURCES/kde-workspace-plastik-do-not-show-disabled-buttons.patch b/SOURCES/kde-workspace-plastik-do-not-show-disabled-buttons.patch
new file mode 100644
index 0000000..9f4e919
--- /dev/null
+++ b/SOURCES/kde-workspace-plastik-do-not-show-disabled-buttons.patch
@@ -0,0 +1,64 @@
+diff --git a/kwin/clients/aurorae/themes/plastik/package/contents/ui/main.qml b/kwin/clients/aurorae/themes/plastik/package/contents/ui/main.qml
+index 77676bf..6772d06 100644
+--- a/kwin/clients/aurorae/themes/plastik/package/contents/ui/main.qml
++++ b/kwin/clients/aurorae/themes/plastik/package/contents/ui/main.qml
+@@ -19,6 +19,29 @@ import org.kde.kwin.decoration 0.1
+ import org.kde.kwin.decorations.plastik 1.0
+ 
+ Decoration {
++    function removeDisabledButtons(buttons) {
++        var btns = "";
++        for (var i = 0; i < buttons.length; i++) {
++            if (buttons[i] == 'I') {
++                if (!decoration.minimizeable) {
++                    continue;
++                }
++            }
++            if (buttons[i] == 'A') {
++                if (!decoration.maximizeable) {
++                    continue;
++                }
++            }
++            if (buttons[i] == 'X') {
++                if (!decoration.closeable) {
++                    continue;
++                }
++            }
++            btns += buttons[i];
++        }
++        return btns;
++    }
++    
+     function readConfig() {
+         switch (decoration.readConfig("BorderSize", DecorationOptions.BorderNormal)) {
+         case DecorationOptions.BorderTiny:
+@@ -263,11 +286,13 @@ Decoration {
+                     shadeButton: shadeButtonComponent
+                     allDesktopsButton: stickyButtonComponent
+                     closeButton: closeButtonComponent
+-                    buttons: options.titleButtonsLeft
+                     anchors {
+                         top: parent.top
+                         left: parent.left
+                     }
++                    Component.onCompleted: {
++                        buttons = removeDisabledButtons(options.titleButtonsLeft);
++                    }
+                 }
+                 Text {
+                     id: caption
+@@ -304,11 +329,13 @@ Decoration {
+                     shadeButton: shadeButtonComponent
+                     allDesktopsButton: stickyButtonComponent
+                     closeButton: closeButtonComponent
+-                    buttons: options.titleButtonsRight
+                     anchors {
+                         top: parent.top
+                         right: parent.right
+                     }
++                    Component.onCompleted: {
++                        buttons = removeDisabledButtons(options.titleButtonsRight);
++                    }
+                 }
+             }
+         }
diff --git a/SOURCES/kde-workspace-taskmanager-check-if-full-when-item-from-group-is-removed.patch b/SOURCES/kde-workspace-taskmanager-check-if-full-when-item-from-group-is-removed.patch
new file mode 100644
index 0000000..a05844a
--- /dev/null
+++ b/SOURCES/kde-workspace-taskmanager-check-if-full-when-item-from-group-is-removed.patch
@@ -0,0 +1,12 @@
+diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp
+index d1f304f..fc2f01f 100644
+--- a/libs/taskmanager/groupmanager.cpp
++++ b/libs/taskmanager/groupmanager.cpp
+@@ -392,6 +392,7 @@ void GroupManagerPrivate::removeTask(::TaskManager::Task *task)
+ 
+     if (item->parentGroup()) {
+         item->parentGroup()->remove(item);
++        checkIfFull();
+     }
+ 
+     //the item must exist as long as the Task does because of activate calls so don't delete the item here, it will delete itself.
diff --git a/SPECS/kde-workspace.spec b/SPECS/kde-workspace.spec
index 12a5b3b..bb26be5 100755
--- a/SPECS/kde-workspace.spec
+++ b/SPECS/kde-workspace.spec
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.11.19
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
 Source0: http://download.kde.org/stable/applications/src/14.12.1/kde-workspace-%{version}.tar.xz
@@ -176,6 +176,12 @@ Patch71: kde-workspace-sanitise-notification-html.patch
 # Bug 1611762 - ksysguardd: "internal buffer too small to read /proc/cpuinfo" when running with many CPUs
 Patch72: kde-workspace-ksysguard-increase-cpu-buffer.patch
 
+# Bug 1677641 - Plastik theme shows defunct close button on non deletable gtk window
+Patch73: kde-workspace-plastik-do-not-show-disabled-buttons.patch
+
+# Bug 1698048 - KDE Task Manager always groups programs even when 'Only when the taskbar is full' is checked
+Patch74: kde-workspace-taskmanager-check-if-full-when-item-from-group-is-removed.patch
+
 ## upstream patches
 Patch101: kde-workspace-4.10-bz#921742.patch
 Patch104: kde-workspace-4.10.x-bz#1001708.patch
@@ -613,6 +619,8 @@ Conflicts: kde-workspace < 4.11.15-3
 %patch70 -p1 -b .kscreenlocker-greeter-unlock-just-once
 %patch71 -p1 -b .sanitise-notification-html
 %patch72 -p1 -b .ksysguard-increase-cpu-buffer
+%patch73 -p1 -b .plastik-do-not-show-disabled-buttons
+%patch74 -p1 -b .taskmanager-check-if-full-when-item-from-group-is-removed
 
 # upstream patches
 %patch101 -p1 -b .bug921742
@@ -1380,7 +1388,18 @@ fi
 %endif
 
 %changelog
-* Tue Feb 12 2019 Jan Grulich <jgrulich@redhat.com> - 4.11-19-13
+* Wed Dec 04 2019 Jan Grulich <jgrulich@redhat.com> - 4.11.19-15
+- Fix curly bracket in the patch for Plastik decoration theme
+  Resolves: bz#1779401
+
+* Mon Aug 05 2019 Jan Grulich <jgrulich@redhat.com> - 4.11.19-14
+- Do not show disabled buttons in Plastik decoration theme
+  Resolves: bz#1677641
+
+- Taskmanager: dismiss group when application is closed and there is enough space
+  Resolve: bz#1698048
+
+* Tue Feb 12 2019 Jan Grulich <jgrulich@redhat.com> - 4.11.19-13
 - Sanitise notification HTML
   Resolves: bz#1568853