From d2e95ca1210b2bbe0a51f7f7a47b5f25309f57cc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 20 May 2021 09:07:18 -0500
Subject: [PATCH] pull in some upstream fixes

---
 .gitignore                          |  2 ++
 plasma-desktop-python-shebang.patch | 20 --------------------
 plasma-desktop.spec                 |  9 ++++++++-
 sources                             |  2 ++
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7918489..57139a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,5 @@
 /plasma-desktop-5.21.4.tar.xz
 /plasma-desktop-5.21.5.tar.xz
 /plasma-desktop-5.21.90.tar.xz
+/0003-Use-python3-explicitly.patch
+/0010-Task-Manager-Optimize-parent-process-CGroup-check.patch
diff --git a/plasma-desktop-python-shebang.patch b/plasma-desktop-python-shebang.patch
index 97a5f22..9b2a659 100644
--- a/plasma-desktop-python-shebang.patch
+++ b/plasma-desktop-python-shebang.patch
@@ -1,23 +1,3 @@
-diff --git a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
-index 56a8d7d..0aec9e3 100755
---- a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
-+++ b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- #  SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
- #
-diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-index 6515cff..8016e60 100755
---- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-+++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import sys
- 
- for line in sys.stdin:
 diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
 index a019986..cec9c78 100644
 --- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index c021b23..31e9717 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -10,7 +10,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.21.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://invent.kde.org/plasma/%{name}
@@ -27,6 +27,8 @@ URL:     https://invent.kde.org/plasma/%{name}
 Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz
 
 ## upstream patches
+Patch3: 0003-Use-python3-explicitly.patch
+Patch10: 0010-Task-Manager-Optimize-parent-process-CGroup-check.patch
 
 ## downstream patches
 # default kickoff favorites: +konsole +apper
@@ -203,6 +205,8 @@ BuildArch: noarch
 %setup -q
 
 ## upstream patches
+%patch3 -p1 -b .0003
+%patch10 -p1 -b .0010
 
 ## upstreamable patches
 #patch200 -p1
@@ -326,6 +330,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d
 
 
 %changelog
+* Thu May 20 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.90-3
+- pull in some upstream fixes
+
 * Sun May 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.90-2
 - s/kf5-ksysguard/libksysguard/
 
diff --git a/sources b/sources
index 2535007..8895939 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (plasma-desktop-5.21.90.tar.xz) = b43cc534869a350bc701a51803aa745b1914b1200f91706d83fd7f9399dde76c527b3568fd2750ae59ba5a951b1c19ccca8c317ed298ce854fa8c1ad64d557f8
+SHA512 (0003-Use-python3-explicitly.patch) = 5ba00cc37809d5cefdcc0ba1a87db0287beed7a9406e25117bd66fcb025442b8a894669824bbbf6165e7bfd4274687553e5f7f8a261d05caa689e36ded1e2bc9
+SHA512 (0010-Task-Manager-Optimize-parent-process-CGroup-check.patch) = 286dcfaf6006cf50c5b3d35f912728e0dc309418eb3d70d7477897e4230e7ae925adc701af42a049b46da68112a19190fd4aeb7beb7c78bf09d3972d91baa54f