5.25.90

.gitignore

@@ -85,3 +85,4 @@
 /plasma-workspace-5.25.3.1.tar.xz
 /plasma-workspace-5.25.4.tar.xz
 /plasma-workspace-5.25.5.tar.xz
+/plasma-workspace-5.25.90.tar.xz

plasma-workspace-5.21.90-folderview_layout.patch

@@ -1,6 +1,7 @@
-diff -up plasma-workspace-5.21.90/lookandfeel/contents/defaults.folderview_layout plasma-workspace-5.21.90/lookandfeel/contents/defaults
+diff --git a/lookandfeel/org.kde.breeze/contents/defaults b/lookandfeel/org.kde.breeze/contents/defaults
---- plasma-workspace-5.21.90/lookandfeel/contents/defaults.folderview_layout	2021-05-14 16:15:40.647354536 -0500
+index d8df939b3..b050a7a87 100644
-+++ plasma-workspace-5.21.90/lookandfeel/contents/defaults	2021-05-14 16:16:21.580720452 -0500
+--- a/lookandfeel/org.kde.breeze/contents/defaults
++++ b/lookandfeel/org.kde.breeze/contents/defaults
 @@ -27,3 +27,7 @@ library=org.kde.breeze
  
  [KSplash]

plasma-workspace-konsole-in-contextmenu.patch

@@ -1,78 +0,0 @@
-diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp
---- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp	2022-05-21 16:42:05.980661922 +0200
-+++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp	2022-05-21 16:47:43.503606798 +0200
-@@ -17,6 +17,7 @@
- #include <KGlobalAccel>
- #include <KIO/CommandLauncherJob>
- #include <KLocalizedString>
-+#include <KTerminalLauncherJob>
- #include <QDebug>
- #include <QIcon>
- 
-@@ -29,6 +30,7 @@
- 
- ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
-     : Plasma::ContainmentActions(parent, args)
-+    , m_runKonsoleAction(nullptr)
-     , m_session(new SessionManagement(this))
- {
- }
-@@ -61,6 +63,7 @@
-                       << QStringLiteral("configure shortcuts")
-                       << QStringLiteral("_sep1")
-                       << QStringLiteral("_context")
-+                      << QStringLiteral("_run_konsole")
-                       << QStringLiteral("_run_command")
-                       << QStringLiteral("add widgets")
-                       << QStringLiteral("_add panel")
-@@ -97,6 +100,10 @@
-         m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0));
-         connect(m_runCommandAction, &QAction::triggered, this, &ContextMenu::runCommand);
- 
-+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
-+        m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal"));
-+        connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole);
-+
-         m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this);
-         m_lockScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen")));
-         m_lockScreenAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("ksmserver"), QStringLiteral("Lock Session")).value(0));
-@@ -179,6 +186,8 @@
-         if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) {
-             return m_runCommandAction;
-         }
-+    } else if (name == QLatin1String("_run_konsole")) {
-+     return m_runKonsoleAction;
-     } else if (name == QLatin1String("_lock_screen")) {
-         if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) {
-             return m_lockScreenAction;
-@@ -212,6 +221,13 @@
-     return nullptr;
- }
- 
-+void ContextMenu::runKonsole()
-+{
-+    auto job = new KTerminalLauncherJob(QString());
-+    job->setWorkingDirectory(QDir::homePath());
-+    job->start();
-+}
-+
- void ContextMenu::runCommand()
- {
-     if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
-diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h
---- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h	2022-05-21 16:42:05.980661922 +0200
-+++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h	2022-05-21 16:48:39.122597718 +0200
-@@ -29,11 +29,13 @@
- 
- public Q_SLOTS:
-     void runCommand();
-+    void runKonsole();
-     void startLogout();
-     void configureDisplays();
- 
- private:
-     QAction *m_runCommandAction = nullptr;
-+    QAction *m_runKonsoleAction = nullptr;
-     QAction *m_lockScreenAction = nullptr;
-     QAction *m_logoutAction = nullptr;
-     QAction *m_configureDisplaysAction = nullptr;

plasma-workspace.spec

@@ -2,7 +2,7 @@
 # repo or arch where there's no package that would provide plasmashell
 #global bootstrap 1
 
-%global kf5_version_min 5.91.0
+%global kf5_version_min 5.98.0
 
 # Control wayland by default
 %if (0%{?rhel} && 0%{?rhel} < 9)
@@ -27,7 +27,7 @@
 
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
-Version: 5.25.5
+Version: 5.25.90
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -67,7 +67,6 @@ Source41:       spice-vdagent.conf
 ## upstreamable Patches
 
 ## downstream Patches
-Patch100:       plasma-workspace-konsole-in-contextmenu.patch
 # default to folderview (instead of desktop) containment, see also
 # https://mail.kde.org/pipermail/distributions/2016-July/000133.html
 # and example,
@@ -126,6 +125,7 @@ BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-qtsvg-devel
 BuildRequires:  qt5-qtwayland-devel
 BuildRequires:  phonon-qt5-devel
+BuildRequires:  polkit-qt5-1-devel
 
 BuildRequires:  kf5-rpm-macros >= %{kf5_version_min}
 BuildRequires:  systemd-rpm-macros
@@ -144,7 +144,6 @@ BuildRequires:  kf5-kguiaddons-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kidletime-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kinit-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kitemmodels-devel >= %{kf5_version_min}
-# konsole patch
 BuildRequires:  kf5-kio-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kjsembed-devel >= %{kf5_version_min}
 BuildRequires:  kf5-knewstuff-devel >= %{kf5_version_min}
@@ -467,7 +466,7 @@ BuildArch: noarch
 # Populate initial lookandfeel package
 cp -a lookandfeel lookandfeel.fedora
 # Overwrite settings to configure twilight mode
-cp -a lookandfeel.twilight/* lookandfeel.fedora
+cp -a lookandfeel/org.kde.breezetwilight/* lookandfeel.fedora
 install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop
 cat >> CMakeLists.txt <<EOL
 plasma_install_package(lookandfeel.fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
@@ -496,7 +495,7 @@ ln -s startplasma-x11 %{buildroot}%{_kf5_bindir}/startkde
 # remove/replace items to be customized
 ln -sf \
   %{_datadir}/backgrounds/default.png \
-  %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/components/artwork/background.png
+  %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/org.kde.breeze/contents/components/artwork/background.png
 
 # make fedora-breeze sddm theme variant.
 cp -alf %{buildroot}%{_datadir}/sddm/themes/breeze/ \
@@ -566,6 +565,7 @@ fi
 %{_kf5_bindir}/plasma_session
 %{_kf5_bindir}/plasma-apply-*
 %{_kf5_bindir}/plasma-interactiveconsole
+%{_kf5_bindir}/plasma-localegen-helper
 %{_kf5_bindir}/plasma-shutdown
 %{_kf5_bindir}/plasma_waitforname
 %{_kf5_bindir}/systemmonitor
@@ -582,8 +582,8 @@ fi
 %{_libexecdir}/kfontprint
 %{_libexecdir}/plasma-changeicons
 %{_libexecdir}/plasma-dbus-run-session-if-needed
-%{_kf5_datadir}/ksplash/
 %{_kf5_datadir}/plasma/avatars/
+%{_kf5_datadir}/plasma/nightcolor/
 %{_kf5_datadir}/plasma/plasmoids/
 %{_kf5_datadir}/plasma/services/
 %{_kf5_datadir}/plasma/wallpapers/
@@ -602,7 +602,9 @@ fi
 %{_datadir}/desktop-directories/*.directory
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/org.kde.fontinst.service
+%{_datadir}/dbus-1/system-services/org.kde.localegenhelper.service
 %{_datadir}/dbus-1/system.d/org.kde.fontinst.conf
+%{_datadir}/dbus-1/system.d/org.kde.localegenhelper.conf
 %{_datadir}/knsrcfiles/*.knsrc
 %{_datadir}/kfontinst/icons/hicolor/*/actions/*font*.png
 %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop
@@ -610,7 +612,7 @@ fi
 %{_datadir}/kxmlgui5/kfontview/kfontviewpart.rc
 %{_datadir}/kxmlgui5/kfontview/kfontviewui.rc
 %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop
-%{_kf5_datadir}/kservices5/ServiceMenus/setaswallpaper.desktop
+%{_kf5_datadir}/kio/servicemenus/setaswallpaper.desktop
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservicetypes5/*.desktop
 %{_kf5_datadir}/knotifications5/*.notifyrc
@@ -632,7 +634,6 @@ fi
 %{_kf5_datadir}/qlogging-categories5/*.categories
 %{_sysconfdir}/xdg/plasmanotifyrc
 %{_kf5_datadir}/kpackage/kcms/kcm_autostart/
-%{_kf5_datadir}/kpackage/kcms/kcm_translations/
 %{_kf5_datadir}/kpackage/kcms/kcm_colors/
 %{_kf5_datadir}/kpackage/kcms/kcm_cursortheme/
 %{_kf5_datadir}/kpackage/kcms/kcm_desktoptheme/
@@ -641,11 +642,12 @@ fi
 %{_kf5_datadir}/kpackage/kcms/kcm_lookandfeel/
 %{_kf5_datadir}/kpackage/kcms/kcm_nightcolor/
 %{_kf5_datadir}/kpackage/kcms/kcm_notifications/
+%{_kf5_datadir}/kpackage/kcms/kcm_regionandlang/
 %{_kf5_datadir}/kpackage/kcms/kcm_style/
 %{_kf5_datadir}/kpackage/kcms/kcm_users/
 %{_kf5_datadir}/kpackage/kcms/kcm_icons/
-%{_kf5_datadir}/kpackage/kcms/kcm_formats/
 %{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy
+%{_kf5_datadir}/polkit-1/actions/org.kde.localegenhelper.policy
 %{_userunitdir}/*.service
 %{_userunitdir}/plasma-core.target
 %dir %{_userunitdir}/plasma-core.target.d/
@@ -772,6 +774,9 @@ fi
 
 
 %changelog
+* Sat Sep 17 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.25.90-1
+- 5.25.90
+
 * Wed Sep 07 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.25.5-1
 - 5.25.5
 

sources

@@ -1,2 +1 @@
-SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
+SHA512 (plasma-workspace-5.25.90.tar.xz) = 90d0a6410a22b4b25682536e80bb7d687f013a51fca1b474c7611fc3348e62c9522c5f1ef73c30a97747a4d5781eed95716d3ad61f12eb457ea74606bc565579
-SHA512 (plasma-workspace-5.25.5.tar.xz) = 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb