From 70b388bbb0c7d7239539d436153e19038700ac30 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 20 May 2019 13:45:34 -0500 Subject: [PATCH] 5.15.90.1 --- .gitignore | 1 + 0001-Fix-group-popup-dialog.patch | 39 ------------------------------- plasma-desktop.spec | 5 +++- sources | 2 +- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 0001-Fix-group-popup-dialog.patch diff --git a/.gitignore b/.gitignore index 5b51ba3..5636422 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /plasma-desktop-5.15.4.tar.xz /plasma-desktop-5.15.5.tar.xz /plasma-desktop-5.15.90.tar.xz +/plasma-desktop-5.15.90.1.tar.xz diff --git a/0001-Fix-group-popup-dialog.patch b/0001-Fix-group-popup-dialog.patch deleted file mode 100644 index 3f35d80..0000000 --- a/0001-Fix-group-popup-dialog.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001 -From: Eike Hein -Date: Thu, 29 Nov 2018 00:22:17 +0900 -Subject: [PATCH] Fix group popup dialog - -Summary: -Fixes regression introduced with ab26ebb18b74: That diff contained -a change unrelated to the original submission, swapping a || out for -&& in response to a review note. This turns out to have broken things. - -BUG:401508 - -Reviewers: davidedmundson - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D17219 ---- - applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml -index 6f592756..28238dce 100644 ---- a/applets/taskmanager/package/contents/ui/GroupDialog.qml -+++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml -@@ -262,7 +262,7 @@ PlasmaCore.Dialog { - // Setting VisualDataModel.rootIndex drops groupRepeater.count to 0 - // before the actual row count. updateSize is therefore invoked twice; - // only update size once the repeater count matches the model role. -- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) { -+ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) { - var task; - var maxWidth = 0; - var maxHeight = 0; --- -2.17.2 - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 9bb4d28..7296c1b 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,7 +3,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.15.90 +Version: 5.15.90.1 Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) @@ -309,6 +309,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %changelog +* Mon May 20 2019 Rex Dieter - 5.15.90.1-1 +- 5.15.90.1 + * Thu May 16 2019 Martin Kyral - 5.15.90-1 - 5.15.90 diff --git a/sources b/sources index 775563a..e3c27aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-desktop-5.15.90.tar.xz) = ce08c12512f1f14cffb5ef1cf16d9323b496ad5c8fd3f61ddc9fdb3ebc0c344f5d37e2b5ab2946497adb910498a461d2a12e2ad4f0c8dfd19f6109d23068da1e +SHA512 (plasma-desktop-5.15.90.1.tar.xz) = d7d95b9ca0ca5c725d74c15459e9ddf2f4c519c81488cdd733891c9d34a82e74dc68529e5b73180388c9f8f9b155d3e67fedd646504ef2e72a8d15e6bbeda8e4