Rebase patch and fix files section

plasma-workspace-5.12.5-konsole-in-contextmenu.patch

@@ -1,32 +1,33 @@
 diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
-index 8f5a827..6271a7d 100644
+index 3271140..dcee8fd 100644
 --- a/containmentactions/contextmenu/menu.cpp
 +++ b/containmentactions/contextmenu/menu.cpp
-@@ -30,6 +30,7 @@
+@@ -28,6 +28,7 @@
- #include <QIcon>
+ #include <KAuthorized>
  #include <KGlobalAccel>
  #include <KLocalizedString>
 +#include <KToolInvocation>
+ #include <QDebug>
+ #include <QIcon>
  
- #include <Plasma/Containment>
- #include <Plasma/Corona>
 @@ -40,6 +41,7 @@
  
  ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
-     : Plasma::ContainmentActions(parent, args),
+     : Plasma::ContainmentActions(parent, args)
-+      m_runKonsoleAction(nullptr),
++    , m_runKonsoleAction(nullptr)
-       m_runCommandAction(nullptr),
+     , m_runCommandAction(nullptr)
-       m_lockScreenAction(nullptr),
+     , m_lockScreenAction(nullptr)
-       m_logoutAction(nullptr),
+     , m_logoutAction(nullptr)
-@@ -79,6 +81,7 @@ void ContextMenu::restore(const KConfigGroup &config)
+@@ -71,7 +73,7 @@ void ContextMenu::restore(const KConfigGroup &config)
-                       << QStringLiteral("configure shortcuts")
+     } else {
-                       << QStringLiteral("_sep1")
+         actions.insert(QStringLiteral("configure shortcuts"), false);
-                       << QStringLiteral("_context")
+         m_actionOrder << QStringLiteral("configure") << QStringLiteral("run associated application") << QStringLiteral("configure shortcuts")
-+                      << QStringLiteral("_run_konsole")
+-                      << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_command") << QStringLiteral("add widgets")
-                       << QStringLiteral("_run_command")
++                      << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_konsole") << QStringLiteral("_run_command") << QStringLiteral("add widgets")
-                       << QStringLiteral("add widgets")
+                       << QStringLiteral("_add panel") << QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("edit mode")
-                       << QStringLiteral("_add panel")
+                       << QStringLiteral("_sep2") << QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep3")
-@@ -105,6 +108,10 @@ void ContextMenu::restore(const KConfigGroup &config)
+                       << QStringLiteral("_wallpaper");
+@@ -90,6 +92,10 @@ void ContextMenu::restore(const KConfigGroup &config)
  
      // everything below should only happen once, so check for it
      if (!m_runCommandAction) {
@@ -37,7 +38,7 @@ index 8f5a827..6271a7d 100644
          m_runCommandAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Show KRunner"), this);
          m_runCommandAction->setIcon(QIcon::fromTheme(QStringLiteral("plasma-search")));
          m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0));
-@@ -185,6 +192,8 @@ QAction *ContextMenu::action(const QString &name)
+@@ -169,6 +175,8 @@ QAction *ContextMenu::action(const QString &name)
          if (c->corona() && c->corona()->immutability() == Plasma::Types::Mutable) {
              return c->corona()->actions()->action(QStringLiteral("add panel"));
          }
@@ -46,7 +47,7 @@ index 8f5a827..6271a7d 100644
      } else if (name == QLatin1String("_run_command")) {
          if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) {
              return m_runCommandAction;
-@@ -212,6 +221,11 @@ QAction *ContextMenu::action(const QString &name)
+@@ -196,6 +204,11 @@ QAction *ContextMenu::action(const QString &name)
      return nullptr;
  }
  
@@ -59,7 +60,7 @@ index 8f5a827..6271a7d 100644
  {
      if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
 diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h
-index 813ff38..a157a48 100644
+index 3cc3d32..5735fb8 100644
 --- a/containmentactions/contextmenu/menu.h
 +++ b/containmentactions/contextmenu/menu.h
 @@ -42,10 +42,12 @@ public:

plasma-workspace.spec

@@ -547,14 +547,12 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %{_kf5_datadir}/knotifications5/*.notifyrc
 %{_kf5_datadir}/config.kcfg/*
 %{_kf5_datadir}/kio_desktop/
-%{_kf5_datadir}/kconf_update/krunnerplugins.upd
 %{_kf5_datadir}/kconf_update/delete_cursor_old_default_size.pl
 %{_kf5_datadir}/kconf_update/delete_cursor_old_default_size.upd
 %{_kf5_datadir}/kconf_update/icons_remove_effects.upd
 %{_kf5_datadir}/kconf_update/krdb_libpathwipe.upd
 %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.pl
 %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.upd
-%{_kf5_libdir}/kconf_update_bin/krunnerplugins
 %{_kf5_metainfodir}/*.xml
 %{_kf5_datadir}/applications/org.kde.klipper.desktop
 %{_kf5_datadir}/applications/org.kde.plasmashell.desktop
@@ -574,6 +572,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %{_kf5_datadir}/kpackage/kcms/kcm_lookandfeel/*
 %{_kf5_datadir}/kpackage/kcms/kcm_style/*
 %{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy
+%{_userunitdir}/*.service
+%{_userunitdir}/*.target
+
 # PAM
 %config(noreplace) %{_sysconfdir}/pam.d/kde
 %exclude %{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop
@@ -622,6 +623,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %{_qt5_plugindir}/kcms/kcm_icons.so
 %{_qt5_plugindir}/kcms/kcm_lookandfeel.so
 %{_qt5_plugindir}/kcms/kcm_style.so
+%{_libdir}/kconf_update_bin/krunnerhistory
 %{_libdir}/kconf_update_bin/krunnerglobalshortcuts
 %{_libdir}/kconf_update_bin/krdb_clearlibrarypath
 %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_applauncher.so
@@ -632,6 +634,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %{_libexecdir}/plasma-sourceenv.sh
 %{_libexecdir}/startplasma-waylandsession
 %{_datadir}/kconf_update/krunnerglobalshortcuts.upd
+%{_datadir}/kconf_update/krunnerhistory.upd
 %{_datadir}/kglobalaccel/krunner.desktop
 
 %files geolocation