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

Update files and dependencies

Browse Source
epel9
Jan Grulich 4 years ago
parent f84a0b7eec
commit 6583bf4cf6
2 changed files with 78 additions and 21 deletions
Show Stats Download Patch File Download Diff File

32
plasma-workspace-5.12.5-konsole-in-contextmenu.patch
Unescape View File

@ -1,5 +1,5 @@
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index 9b641bb..b2a1d17 100644
index 8f5a827..6271a7d 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -30,6 +30,7 @@
@ -10,7 +10,7 @@ index 9b641bb..b2a1d17 100644
#include <Plasma/Containment>
#include <Plasma/Corona>
@@ -45,6 +46,7 @@
@@ -40,6 +41,7 @@
ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
: Plasma::ContainmentActions(parent, args),
@ -18,16 +18,15 @@ index 9b641bb..b2a1d17 100644
m_runCommandAction(nullptr),
m_lockScreenAction(nullptr),
m_logoutAction(nullptr),
@@ -74,7 +76,7 @@ void ContextMenu::restore(const KConfigGroup &config)
m_actionOrder << QStringLiteral("add widgets") << QStringLiteral("_add panel") << QStringLiteral("_context") << QStringLiteral("configure") << QStringLiteral("remove");
} else {
actions.insert(QStringLiteral("configure shortcuts"), false);
- m_actionOrder << QStringLiteral("_context") << QStringLiteral("_run_command") << QStringLiteral("add widgets") << QStringLiteral("_add panel")
+ m_actionOrder << QStringLiteral("_context") << QStringLiteral("_run_konsole") << QStringLiteral("_run_command") << QStringLiteral("add widgets") << QStringLiteral("_add panel")
<< QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("edit mode") << QStringLiteral("_sep1")
<<QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep2") << QStringLiteral("run associated application") << QStringLiteral("configure")
<< QStringLiteral("configure shortcuts") << QStringLiteral("_sep3") << QStringLiteral("_wallpaper");
@@ -93,6 +95,10 @@ void ContextMenu::restore(const KConfigGroup &config)
@@ -79,6 +81,7 @@ void ContextMenu::restore(const KConfigGroup &config)
<< QStringLiteral("configure shortcuts")
<< QStringLiteral("_sep1")
<< QStringLiteral("_context")
+ << QStringLiteral("_run_konsole")
<< QStringLiteral("_run_command")
<< QStringLiteral("add widgets")
<< QStringLiteral("_add panel")
@@ -105,6 +108,10 @@ void ContextMenu::restore(const KConfigGroup &config)
// everything below should only happen once, so check for it
if (!m_runCommandAction) {
@ -38,7 +37,7 @@ index 9b641bb..b2a1d17 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));
@@ -164,6 +170,8 @@ QAction *ContextMenu::action(const QString &name)
@@ -185,6 +192,8 @@ QAction *ContextMenu::action(const QString &name)
if (c->corona() && c->corona()->immutability() == Plasma::Types::Mutable) {
return c->corona()->actions()->action(QStringLiteral("add panel"));
}
@ -47,7 +46,7 @@ index 9b641bb..b2a1d17 100644
} else if (name == QLatin1String("_run_command")) {
if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) {
return m_runCommandAction;
@@ -191,6 +199,11 @@ QAction *ContextMenu::action(const QString &name)
@@ -212,6 +221,11 @@ QAction *ContextMenu::action(const QString &name)
return nullptr;
}
@ -60,10 +59,10 @@ index 9b641bb..b2a1d17 100644
{
if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h
index 2b0bbe4..c1f6eb2 100644
index 813ff38..a157a48 100644
--- a/containmentactions/contextmenu/menu.h
+++ b/containmentactions/contextmenu/menu.h
@@ -42,10 +42,12 @@
@@ -42,10 +42,12 @@ public:
void save(KConfigGroup &config) override;
public Q_SLOTS:
@ -76,4 +75,3 @@ index 2b0bbe4..c1f6eb2 100644
QAction *m_runCommandAction;
QAction *m_lockScreenAction;
QAction *m_logoutAction;

63
plasma-workspace.spec
Unescape View File

@ -75,6 +75,7 @@ BuildRequires: libXfixes-devel
BuildRequires: libXrandr-devel
BuildRequires: libXcursor-devel
BuildRequires: libXtst-devel
BuildRequires: libXft-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xcb-util-image-devel
@ -89,6 +90,7 @@ BuildRequires: libbsd-devel
BuildRequires: pam-devel
BuildRequires: lm_sensors-devel
BuildRequires: pciutils-devel
BuildRequires: pipewire-devel
%ifnarch s390 s390x
BuildRequires: libraw1394-devel
%endif
@ -99,9 +101,13 @@ BuildRequires: kf5-kholidays-devel
BuildRequires: kf5-prison-devel
BuildRequires: qt5-qtbase-devel >= 5.7.0
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtwayland-devel
BuildRequires: phonon-qt5-devel
BuildRequires: kf5-rpm-macros >= %{kf5_version_min}
@ -132,14 +138,17 @@ Requires: kf5-plasma%{?_isa} >= %{_kf5_version}
BuildRequires: kf5-threadweaver-devel >= %{kf5_version_min}
BuildRequires: kf5-kded-devel >= %{kf5_version_min}
BuildRequires: kf5-ksysguard-devel >= %{majmin_ver}
BuildRequires: kf5-kwayland-devel >= %{kf5_version_min}
BuildRequires: wayland-devel >= 1.3.0
BuildRequires: libkscreen-qt5-devel >= %{majmin_ver}
BuildRequires: kscreenlocker-devel >= %{majmin_ver}
BuildRequires: kwin-devel >= %{majmin_ver}
BuildRequires: kuserfeedback-devel
BuildRequires: plasma-wayland-protocols-devel
BuildRequires: chrpath
BuildRequires: desktop-file-utils
@ -497,11 +506,20 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_kf5_bindir}/startkde
%{_kf5_bindir}/systemmonitor
%{_kf5_bindir}/xembedsniproxy
%{_kf5_bindir}/kcolorschemeeditor
%{_kf5_bindir}/kde-systemd-start-condition
%{_kf5_bindir}/kfontinst
%{_kf5_bindir}/kfontview
%{_kf5_bindir}/krdb
%{_kf5_bindir}/lookandfeeltool
%{_kf5_libdir}/libkdeinit5_*.so
%{_kf5_qmldir}/org/kde/*
%{_libexecdir}/baloorunner
%{_libexecdir}/ksmserver-logout-greeter
%{_libexecdir}/ksyncdbusenv
%{_libexecdir}/kf5/kauth/fontinst*
%{_libexecdir}/kfontprint
%{_libexecdir}/plasma-changeicons
%{_libexecdir}/plasma-dbus-run-session-if-needed
%{_kf5_datadir}/ksplash/
%{_kf5_datadir}/plasma/plasmoids/
%{_kf5_datadir}/plasma/services/
@ -511,9 +529,22 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_kf5_datadir}/solid/
%{_kf5_datadir}/kstyle/
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/icons/hicolor/*/*/*font*.png
%{_datadir}/icons/hicolor/scalable/apps/preferences-desktop-font-installer.svgz
%{_datadir}/desktop-directories/*.directory
%{_datadir}/dbus-1/services/*.service
%{_datadir}/dbus-1/system-services/org.kde.fontinst.service
%{_datadir}/dbus-1/system.d/org.kde.fontinst.conf
%{_datadir}/knsrcfiles/*.knsrc
%{_datadir}/kdisplay/app-defaults/*
%{_datadir}/kfontinst/icons/hicolor/*/actions/*font*.png
%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop
%{_datadir}/krunner/dbusplugins/plasma-runner-baloosearch.desktop
%{_datadir}/kxmlgui5/kfontinst/kfontviewpart.rc
%{_datadir}/kxmlgui5/kfontview/kfontviewui.rc
%{_kf5_datadir}/kcontrol/pics/logo.png
%{_kf5_datadir}/kcontrol/pics/mini-world.png
%{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop
%{_kf5_datadir}/kservices5/*.desktop
%{_kf5_datadir}/kservices5/*.protocol
%{_kf5_datadir}/kservicetypes5/*.desktop
@ -521,15 +552,32 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_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
%{_kf5_datadir}/applications/plasma-windowed.desktop
%{_kf5_datadir}/applications/org.kde.systemmonitor.desktop
%{_kf5_datadir}/applications/org.kde.kcolorschemeeditor.desktop
%{_kf5_datadir}/applications/org.kde.kfontview.desktop
%{_kf5_datadir}/qlogging-categories5/*.categories
%{_sysconfdir}/xdg/plasmanotifyrc
%{_kf5_datadir}/kpackage/kcms/kcm_translations/*
%{_kf5_datadir}/kpackage/kcms/kcm5_icons/*
%{_kf5_datadir}/kpackage/kcms/kcm_colors/*
%{_kf5_datadir}/kpackage/kcms/kcm_cursortheme/*
%{_kf5_datadir}/kpackage/kcms/kcm_desktoptheme/*
%{_kf5_datadir}/kpackage/kcms/kcm_feedback/*
%{_kf5_datadir}/kpackage/kcms/kcm_fonts/*
%{_kf5_datadir}/kpackage/kcms/kcm_lookandfeel/*
%{_kf5_datadir}/kpackage/kcms/kcm_style/*
%{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy
# PAM
%config(noreplace) %{_sysconfdir}/pam.d/kde
%exclude %{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop
@ -552,6 +600,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_libdir}/libtaskmanager.so.*
%{_libdir}/libweather_ion.so.*
%{_libdir}/libnotificationmanager.*
%{_libdir}/libkfontinst*
# multilib'able plugins
%{_kf5_qtplugindir}/plasma/applets/
%{_kf5_qtplugindir}/plasma/dataengine/
@ -567,8 +616,18 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_kf5_qtplugindir}/kpackage/packagestructure/*.so
%{_kf5_plugindir}/kio/*.so
%{_kf5_plugindir}/kded/*.so
%{_kf5_plugindir}/krunner/krunner*
%{_qt5_plugindir}/kcms/kcm_translations.so
%{_qt5_plugindir}/kcms/kcm_colors.so
%{_qt5_plugindir}/kcms/kcm_cursortheme.so
%{_qt5_plugindir}/kcms/kcm_desktoptheme.so
%{_qt5_plugindir}/kcms/kcm_feedback.so
%{_qt5_plugindir}/kcms/kcm_fonts.so
%{_qt5_plugindir}/kcms/kcm_icons.so
%{_qt5_plugindir}/kcms/kcm_lookandfeel.so
%{_qt5_plugindir}/kcms/kcm_style.so
%{_libdir}/kconf_update_bin/krunnerglobalshortcuts
%{_libdir}/kconf_update_bin/krdb_clearlibrarypath
%{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_applauncher.so
%{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_contextmenu.so
%{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_paste.so

Write Preview
Loading…
Cancel
Save