From 989fec11bb36d1930f9ae9c6271c861e55da5c1b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 20 Jun 2020 10:39:03 -0700 Subject: [PATCH] Revert "plasma-workspace: spec file and patches updated for 5.18.90" This reverts commit b8d26ed45494fcffd165e0d53f6fca25a4a11fea. One more part of reverting to 5.18.5 that I missed. --- plasma-workspace-5.12.5-konsole-in-contextmenu.patch | 9 +++++---- plasma-workspace-5.18.4.1-filter-environment-v2.patch | 7 +++---- plasma-workspace.spec | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plasma-workspace-5.12.5-konsole-in-contextmenu.patch b/plasma-workspace-5.12.5-konsole-in-contextmenu.patch index 2c1d1e1..1a148b9 100644 --- a/plasma-workspace-5.12.5-konsole-in-contextmenu.patch +++ b/plasma-workspace-5.12.5-konsole-in-contextmenu.patch @@ -63,17 +63,18 @@ diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextm index 2b0bbe4..c1f6eb2 100644 --- a/containmentactions/contextmenu/menu.h +++ b/containmentactions/contextmenu/menu.h -@@ -42,10 +42,12 @@ +@@ -40,12 +40,14 @@ public: void save(KConfigGroup &config) override; - + public Q_SLOTS: + void runKonsole(); void runCommand(); + void lockScreen(); void startLogout(); - + void logout(); + private: + QAction *m_runKonsoleAction; QAction *m_runCommandAction; QAction *m_lockScreenAction; QAction *m_logoutAction; - diff --git a/plasma-workspace-5.18.4.1-filter-environment-v2.patch b/plasma-workspace-5.18.4.1-filter-environment-v2.patch index fe79f7c..20dd271 100644 --- a/plasma-workspace-5.18.4.1-filter-environment-v2.patch +++ b/plasma-workspace-5.18.4.1-filter-environment-v2.patch @@ -1,13 +1,12 @@ diff -r -U3 plasma-workspace-5.18.4.1.orig/startkde/startplasma.cpp plasma-workspace-5.18.4.1/startkde/startplasma.cpp --- plasma-workspace-5.18.4.1.orig/startkde/startplasma.cpp 2020-03-31 17:33:37.000000000 +0300 +++ plasma-workspace-5.18.4.1/startkde/startplasma.cpp 2020-04-03 20:43:32.178541309 +0300 -@@ -28,6 +28,9 @@ +@@ -22,6 +22,8 @@ + #include + #include #include - #include - +#include +#include -+ #include #include diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 0cb96d0..e68380b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -468,7 +468,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_bindir}/plasmashell %{_kf5_bindir}/plasmawindowed %{_kf5_bindir}/plasma_session -%{_kf5_bindir}/plasma-shutdown %{_kf5_bindir}/plasma_waitforname %{_kf5_bindir}/startkde %{_kf5_bindir}/startplasma-x11 @@ -505,6 +504,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/applications/plasma-windowed.desktop %{_kf5_datadir}/applications/org.kde.systemmonitor.desktop %{_datadir}/xsessions/plasma.desktop +%{_kf5_bindir}/plasma_waitforname %{_kf5_datadir}/qlogging-categories5/*.categories %{_sysconfdir}/xdg/plasmanotifyrc %{_kf5_datadir}/kpackage/kcms/kcm_translations/*