rpms
/
plasma-workspace
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase patches

Browse Source
epel9
Rex Dieter 8 years ago
parent 4b7b377467
commit d5912e1638
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

37
plasma-workspace-5.6.1-konsole-in-contextmenu.patch → plasma-workspace-5.7.95-konsole-in-contextmenu.patch
Unescape View File

@ -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 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.6.1/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu 2016-03-29 09:22:11.000000000 -0500 --- plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu 2016-09-15 06:25:28.000000000 -0500
+++ plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp 2016-04-08 16:43:57.737164018 -0500 +++ plasma-workspace-5.7.95/containmentactions/contextmenu/menu.cpp 2016-09-22 18:08:59.562282083 -0500
@@ -30,6 +30,7 @@ @@ -31,6 +31,7 @@
#include <QDebug>
#include <QIcon> #include <QIcon>
#include <KGlobalAccel>
#include <KLocalizedString> #include <KLocalizedString>
+#include <KToolInvocation> +#include <KToolInvocation>
#include <Plasma/Containment> #include <Plasma/Containment>
#include <Plasma/Corona> #include <Plasma/Corona>
@@ -45,6 +46,7 @@ @@ -46,6 +47,7 @@
ContextMenu::ContextMenu(QObject *parent, const QVariantList &args) ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
: Plasma::ContainmentActions(parent, 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_runCommandAction(0),
m_lockScreenAction(0), m_lockScreenAction(0),
m_logoutAction(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"); m_actionOrder << QStringLiteral("add widgets") << QStringLiteral("_add panel") << QStringLiteral("lock widgets") << QStringLiteral("_context") << QStringLiteral("configure") << QStringLiteral("remove");
} else { } else {
actions.insert(QStringLiteral("configure shortcuts"), false); 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") << QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("lock widgets") << QStringLiteral("_sep1")
<<QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep2") << QStringLiteral("run associated application") << QStringLiteral("configure") <<QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep2") << QStringLiteral("run associated application") << QStringLiteral("configure")
<< QStringLiteral("configure shortcuts") << QStringLiteral("_sep3") << QStringLiteral("_wallpaper"); << QStringLiteral("configure shortcuts") << QStringLiteral("_sep3") << QStringLiteral("_wallpaper");
@@ -93,6 +95,10 @@ void ContextMenu::restore(const KConfigG @@ -94,6 +96,10 @@ void ContextMenu::restore(const KConfigG
// everything below should only happen once, so check for it // everything below should only happen once, so check for it
if (!m_runCommandAction) { if (!m_runCommandAction) {
@ -36,17 +36,17 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole-
+ +
m_runCommandAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Run Command..."), this); m_runCommandAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Run Command..."), this);
m_runCommandAction->setIcon(QIcon::fromTheme(QStringLiteral("system-run"))); m_runCommandAction->setIcon(QIcon::fromTheme(QStringLiteral("system-run")));
setGlobalActionShortcut(m_runCommandAction, QStringLiteral("krunner"), QStringLiteral("run command")); m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner"), QStringLiteral("run command")).value(0));
@@ -158,6 +164,8 @@ QAction *ContextMenu::action(const QStri @@ -165,6 +171,8 @@ QAction *ContextMenu::action(const QStri
if (c->corona() && c->corona()->immutability() == Plasma::Types::Mutable) { if (c->corona() && c->corona()->immutability() == Plasma::Types::Mutable) {
return c->corona()->actions()->action(QStringLiteral("add panel")); return c->corona()->actions()->action(QStringLiteral("add panel"));
} }
+ } else if (name == QLatin1String("_run_konsole")) { + } else if (name == QLatin1String("_run_konsole")) {
+ return m_runKonsoleAction; + return m_runKonsoleAction;
} else if (name == QLatin1String("_run_command")) { } else if (name == QLatin1String("_run_command")) {
if (KAuthorized::authorizeKAction(QStringLiteral("run_command"))) { if (KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
return m_runCommandAction; return m_runCommandAction;
@@ -185,6 +193,11 @@ QAction *ContextMenu::action(const QStri @@ -192,6 +200,11 @@ QAction *ContextMenu::action(const QStri
return 0; return 0;
} }
@ -57,11 +57,11 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.cpp.konsole-
+ +
void ContextMenu::runCommand() void ContextMenu::runCommand()
{ {
if (!KAuthorized::authorizeKAction(QStringLiteral("run_command"))) { if (!KAuthorized::authorizeAction(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 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.6.1/containmentactions/contextmenu/menu.h.konsole-in-contextmenu 2016-03-29 09:22:11.000000000 -0500 --- plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h.konsole-in-contextmenu 2016-09-15 06:25:28.000000000 -0500
+++ plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h 2016-04-08 16:44:43.030386670 -0500 +++ plasma-workspace-5.7.95/containmentactions/contextmenu/menu.h 2016-09-22 18:04:41.564858642 -0500
@@ -40,6 +40,7 @@ public: @@ -40,12 +40,14 @@ public:
void save(KConfigGroup &config) override; void save(KConfigGroup &config) override;
public Q_SLOTS: public Q_SLOTS:
@ -69,10 +69,9 @@ diff -up plasma-workspace-5.6.1/containmentactions/contextmenu/menu.h.konsole-in
void runCommand(); void runCommand();
void lockScreen(); void lockScreen();
void startLogout(); void startLogout();
@@ -47,6 +48,7 @@ public Q_SLOTS: void logout();
private: private:
void setGlobalActionShortcut(QAction * action, const QString & component, const QString & actionId);
+ QAction *m_runKonsoleAction; + QAction *m_runKonsoleAction;
QAction *m_runCommandAction; QAction *m_runCommandAction;
QAction *m_lockScreenAction; QAction *m_lockScreenAction;

5
plasma-workspace.spec
Unescape View File

@ -32,12 +32,13 @@ Source12: twenty.two.desktop
Source13: twenty.three.desktop Source13: twenty.three.desktop
## downstream Patches ## 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 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 # remove stuff we don't want or need, plus a minor bit of customization --rex
Patch12: startkde.patch Patch12: startkde.patch
Patch13: startplasmacompositor.patch Patch13: startplasmacompositor.patch
# revert (semi) regresssion wrt systray icon sizes, http://bugs.kde.org/365570 # 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 Patch14: plasma-workspace-5.7.4-systray_iconSizes.patch
# default to folderview (instead of desktop) containment, see also # default to folderview (instead of desktop) containment, see also
# https://mail.kde.org/pipermail/distributions/2016-July/000133.html # 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 %endif
%patch12 -p1 -b .startkde %patch12 -p1 -b .startkde
%patch13 -p1 -b .startplasmacompositor %patch13 -p1 -b .startplasmacompositor
%patch14 -p1 #patch14 -p1
%patch15 -p1 %patch15 -p1
# highlight the use of wayland # highlight the use of wayland

Write Preview
Loading…
Cancel
Save