diff --git a/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch b/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch deleted file mode 100644 index 3c11ce8..0000000 --- a/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 27704daf4440b1d41262d687bf60b734fbc8475c Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Fri, 16 Jul 2021 16:11:29 +0100 -Subject: [PATCH 180/219] Add plasma-kwallet-pam.service to our wanted list - -Order is handled by the wallet service. ---- - startkde/systemd/plasma-workspace@.target | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/startkde/systemd/plasma-workspace@.target b/startkde/systemd/plasma-workspace@.target -index 0950e2fc4..6c676d4da 100644 ---- a/startkde/systemd/plasma-workspace@.target -+++ b/startkde/systemd/plasma-workspace@.target -@@ -1,6 +1,6 @@ - [Unit] - Description=KDE Plasma Workspace - Requires=plasma-core.target xdg-desktop-autostart.target graphical-session.target --Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service kde-baloo.service plasma-foreground-booster.service -+Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service kde-baloo.service plasma-foreground-booster.service plasma-kwallet-pam.service - BindsTo=graphical-session.target - Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service --- -2.31.1 - diff --git a/plasma-workspace-5.22-devicenotifier.patch b/plasma-workspace-5.22-devicenotifier.patch deleted file mode 100644 index e7cd062..0000000 --- a/plasma-workspace-5.22-devicenotifier.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001 -From: Fabio Bas -Date: Fri, 3 Sep 2021 19:23:12 +0200 -Subject: [PATCH] Update solid connectedSources when a new source gets added by - hotplug BUG: 438874 - ---- - applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml -index a1dc20b83..404ae95e6 100644 ---- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml -+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml -@@ -75,6 +75,7 @@ Item { - onSourceAdded: { - disconnectSource(source); - connectSource(source); -+ sdSource.connectedSources = sources - } - onSourceRemoved: { - disconnectSource(source); -@@ -98,7 +99,6 @@ Item { - PlasmaCore.DataSource { - id: sdSource - engine: "soliddevice" -- connectedSources: hpSource.sources - interval: 0 - property string last - onSourceAdded: { --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 6111b3a..0549f01 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -21,7 +21,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.22.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -64,7 +64,7 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## downstream Patches -Patch100: plasma-workspace-5.21.90-konsole-in-contextmenu.patch +#Patch100: plasma-workspace-5.21.90-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html @@ -75,9 +75,6 @@ Patch105: plasma-workspace-5.21.90-folderview_layout.patch ## upstreamable Patches ## upstream Patches (master branch) -Patch180: 0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch -# https://invent.kde.org/plasma/plasma-workspace/commit/61e2ea2323ae63c5805c87353701ba6fb722205a -Patch181: plasma-workspace-5.22-devicenotifier.patch # udev BuildRequires: zlib-devel @@ -449,10 +446,10 @@ BuildArch: noarch %setup -q -a 20 ## upstream patches -%patch180 -p1 -%patch181 -p1 -b .devicenotifier - -%patch100 -p1 -b .konsole-in-contextmenu +# FIXME/TODO: commented out in need of work: does not applyl cleanly and +# potentially causes problems: +# Since it appears plasma-workspace no longer uses kinit, the KToolInvocation::invokeTerminal call may not be 100% reliable +#%patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex %if 0%{?default_lookandfeel:1} %patch101 -p1 -b .set-fedora-default-look-and-feel @@ -543,7 +540,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %files common -%license COPYING* +%license LICENSES %files -f %{name}.lang %{_kf5_bindir}/gmenudbusmenuproxy @@ -557,6 +554,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_bindir}/plasmawindowed %{_kf5_bindir}/plasma_session %{_kf5_bindir}/plasma-apply-* +%{_kf5_bindir}/plasma-interactiveconsole %{_kf5_bindir}/plasma-shutdown %{_kf5_bindir}/plasma_waitforname %{_kf5_bindir}/systemmonitor @@ -565,9 +563,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_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 @@ -581,6 +577,8 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/plasma/wallpapers/ %dir %{_kf5_datadir}/plasma/look-and-feel/ %{_kf5_datadir}/plasma/look-and-feel/org.kde.breeze.desktop/ +%{_kf5_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/ +%{_kf5_datadir}/plasma/look-and-feel/org.kde.breezetwilight.desktop/ %{_kf5_datadir}/solid/ %{_kf5_datadir}/kstyle/ %if %{with systemdBoot} @@ -594,7 +592,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_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 @@ -602,7 +599,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_datadir}/kxmlgui5/kfontview/kfontviewui.rc %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop %{_kf5_datadir}/kservices5/*.desktop -%{_kf5_datadir}/kservices5/*.protocol %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/knotifications5/*.notifyrc %{_kf5_datadir}/config.kcfg/* @@ -643,10 +639,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %dir %{_userunitdir}/plasma-workspace@.target.d/ # PAM %config(noreplace) %{_sysconfdir}/pam.d/kde -%exclude %{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop -%exclude %{_kf5_datadir}/kservices5/plasma-geolocation-gps.desktop -%exclude %{_kf5_datadir}/kservices5/plasma-geolocation-ip.desktop -%exclude %{_kf5_datadir}/kservicetypes5/plasma-geolocationprovider.desktop %files doc -f %{name}-doc.lang @@ -672,9 +664,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_qtplugindir}/plasmacalendarplugins/ %endif %{_kf5_qtplugindir}/*.so -%exclude %{_kf5_qtplugindir}/plasma-geolocation-gps.so -%exclude %{_kf5_qtplugindir}/plasma-geolocation-ip.so %exclude %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_geolocation.so +%exclude %{_kf5_qtplugindir}/plasma/geolocationprovider/plasma-geolocation-gps.so +%exclude %{_kf5_qtplugindir}/plasma/geolocationprovider/plasma-geolocation-ip.so %dir %{_kf5_qtplugindir}/phonon_platform/ %{_kf5_qtplugindir}/phonon_platform/kde.so %{_kf5_qtplugindir}/kpackage/packagestructure/*.so @@ -684,11 +676,13 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_qt5_plugindir}/kcms/kcm_*.so %{_libdir}/kconf_update_bin/krunnerhistory %{_libdir}/kconf_update_bin/krunnerglobalshortcuts +%{_kf5_qtplugindir}/kf5/parts/kfontviewpart.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_applauncher.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_contextmenu.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_paste.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchdesktop.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchwindow.so +%{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchactivity.so %{_libexecdir}/plasma-sourceenv.sh %{_libexecdir}/startplasma-waylandsession %{_kf5_datadir}/kconf_update/krunnerhistory.upd @@ -696,13 +690,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/kglobalaccel/org.kde.krunner.desktop %files geolocation -%{_kf5_qtplugindir}/plasma-geolocation-gps.so -%{_kf5_qtplugindir}/plasma-geolocation-ip.so %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_geolocation.so -%{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop -%{_kf5_datadir}/kservices5/plasma-geolocation-gps.desktop -%{_kf5_datadir}/kservices5/plasma-geolocation-ip.desktop -%{_kf5_datadir}/kservicetypes5/plasma-geolocationprovider.desktop +%{_kf5_qtplugindir}/plasma/geolocationprovider/plasma-geolocation-gps.so +%{_kf5_qtplugindir}/plasma/geolocationprovider/plasma-geolocation-ip.so %ldconfig_scriptlets geolocation-libs @@ -729,7 +719,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_libdir}/cmake/LibTaskManager/ %{_libdir}/cmake/LibNotificationManager/ %{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/kdevappwizard/templates/ion-dataengine.tar.bz2 %files -n sddm-breeze %{_datadir}/sddm/themes/breeze/ @@ -762,6 +751,12 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Mon Sep 20 2021 Marc Deop - 5.22.90-2 +- Remove patch(180) already applied upstream +- Remove patch(181) already applied upstream +- Comment out patch(100) as it does not apply cleanly +- Adjust files sections + * Fri Sep 17 2021 Marc Deop - 5.22.90-1 - 5.22.90