From d5912e16381526c5b47aecbf437e03e39c1c908b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Sep 2016 18:11:45 -0500 Subject: [PATCH] rebase patches --- ...kspace-5.7.95-konsole-in-contextmenu.patch | 37 +++++++++---------- plasma-workspace.spec | 5 ++- 2 files changed, 21 insertions(+), 21 deletions(-) rename plasma-workspace-5.6.1-konsole-in-contextmenu.patch => plasma-workspace-5.7.95-konsole-in-contextmenu.patch (65%) diff --git a/plasma-workspace-5.6.1-konsole-in-contextmenu.patch b/plasma-workspace-5.7.95-konsole-in-contextmenu.patch similarity index 65% rename from plasma-workspace-5.6.1-konsole-in-contextmenu.patch rename to plasma-workspace-5.7.95-konsole-in-contextmenu.patch index c7bee1f..9d788e1 100644 --- a/plasma-workspace-5.6.1-konsole-in-contextmenu.patch +++ b/plasma-workspace-5.7.95-konsole-in-contextmenu.patch @@ -1,15 +1,15 @@ -diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp ---- plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu 2016-03-29 09:22:11.000000000 -0500 -+++ plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp 2016-04-08 16:43:57.737164018 -0500 -@@ -30,6 +30,7 @@ - #include +diff -up plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp +--- plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu 2016-09-15 06:25:28.000000000 -0500 ++++ plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp 2016-09-22 18:08:59.562282083 -0500 +@@ -31,6 +31,7 @@ #include + #include #include +#include #include #include -@@ -45,6 +46,7 @@ +@@ -46,6 +47,7 @@ ContextMenu::ContextMenu(QObject *parent, const QVariantList &args) : Plasma::ContainmentActions(parent, args), @@ -17,7 +17,7 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole- m_runCommandAction(0), m_lockScreenAction(0), m_logoutAction(0), -@@ -74,7 +76,7 @@ void ContextMenu::restore(const KConfigG +@@ -75,7 +77,7 @@ void ContextMenu::restore(const KConfigG m_actionOrder << QStringLiteral("add widgets") << QStringLiteral("_add panel") << QStringLiteral("lock widgets") << QStringLiteral("_context") << QStringLiteral("configure") << QStringLiteral("remove"); } else { actions.insert(QStringLiteral("configure shortcuts"), false); @@ -26,7 +26,7 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole- << QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("lock widgets") << QStringLiteral("_sep1") <setIcon(QIcon::fromTheme(QStringLiteral("system-run"))); - setGlobalActionShortcut(m_runCommandAction, QStringLiteral("krunner"), QStringLiteral("run command")); -@@ -158,6 +164,8 @@ QAction *ContextMenu::action(const QStri + m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner"), QStringLiteral("run command")).value(0)); +@@ -165,6 +171,8 @@ QAction *ContextMenu::action(const QStri if (c->corona() && c->corona()->immutability() == Plasma::Types::Mutable) { return c->corona()->actions()->action(QStringLiteral("add panel")); } + } else if (name == QLatin1String("_run_konsole")) { + return m_runKonsoleAction; } else if (name == QLatin1String("_run_command")) { - if (KAuthorized::authorizeKAction(QStringLiteral("run_command"))) { + if (KAuthorized::authorizeAction(QStringLiteral("run_command"))) { return m_runCommandAction; -@@ -185,6 +193,11 @@ QAction *ContextMenu::action(const QStri +@@ -192,6 +200,11 @@ QAction *ContextMenu::action(const QStri return 0; } @@ -57,11 +57,11 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole- + void ContextMenu::runCommand() { - if (!KAuthorized::authorizeKAction(QStringLiteral("run_command"))) { -diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h.konsole-in-contextmenu plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h ---- plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h.konsole-in-contextmenu 2016-03-29 09:22:11.000000000 -0500 -+++ plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h 2016-04-08 16:44:43.030386670 -0500 -@@ -40,6 +40,7 @@ public: + if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) { +diff -up plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h.konsole-in-contextmenu plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h +--- plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h.konsole-in-contextmenu 2016-09-15 06:25:28.000000000 -0500 ++++ plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h 2016-09-22 18:04:41.564858642 -0500 +@@ -40,12 +40,14 @@ public: void save(KConfigGroup &config) override; public Q_SLOTS: @@ -69,10 +69,9 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h.konsole-in void runCommand(); void lockScreen(); void startLogout(); -@@ -47,6 +48,7 @@ public Q_SLOTS: + void logout(); private: - void setGlobalActionShortcut(QAction * action, const QString & component, const QString & actionId); + QAction *m_runKonsoleAction; QAction *m_runCommandAction; QAction *m_lockScreenAction; diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f087487..ffde57e 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -32,12 +32,13 @@ Source12: twenty.two.desktop Source13: twenty.three.desktop ## downstream Patches -Patch10: plasma-workspace-5.6.1-konsole-in-contextmenu.patch +Patch10: plasma-workspace-5.7.95-konsole-in-contextmenu.patch Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # remove stuff we don't want or need, plus a minor bit of customization --rex Patch12: startkde.patch Patch13: startplasmacompositor.patch # revert (semi) regresssion wrt systray icon sizes, http://bugs.kde.org/365570 +# FIXME/TODO: port patch or drop it -- rex (probably drop at this point) Patch14: plasma-workspace-5.7.4-systray_iconSizes.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html @@ -416,7 +417,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee %endif %patch12 -p1 -b .startkde %patch13 -p1 -b .startplasmacompositor -%patch14 -p1 +#patch14 -p1 %patch15 -p1 # highlight the use of wayland