diff --git a/0001-Revert-No-icons-on-the-desktop-by-default.patch b/0001-Revert-No-icons-on-the-desktop-by-default.patch index 8a69320..99f3de3 100644 --- a/0001-Revert-No-icons-on-the-desktop-by-default.patch +++ b/0001-Revert-No-icons-on-the-desktop-by-default.patch @@ -14,19 +14,19 @@ reason not to have them. 3 files changed, 93 insertions(+) create mode 100644 kioslave/desktop/Home.desktop -Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/CMakeLists.txt +Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/CMakeLists.txt =================================================================== ---- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/kioslave/desktop/CMakeLists.txt 2019-03-09 17:14:18.000000000 +0100 -+++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/CMakeLists.txt 2019-03-10 14:10:36.943333000 +0100 +--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/kioslave/desktop/CMakeLists.txt 2021-01-21 14:41:53.000000000 +0100 ++++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/CMakeLists.txt 2021-01-22 08:39:23.984081176 +0100 @@ -33,3 +33,4 @@ install( FILES desktop.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop) +install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks) -Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/Home.desktop +Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/Home.desktop =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/Home.desktop 2019-03-10 14:10:36.943333000 +0100 ++++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/Home.desktop 2021-01-22 08:39:23.984081176 +0100 @@ -0,0 +1,88 @@ +[Desktop Entry] +Encoding=UTF-8 @@ -116,13 +116,13 @@ Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/Hom +Icon=user-home +Type=Link + -Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/kio_desktop.cpp +Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/kio_desktop.cpp =================================================================== ---- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/kioslave/desktop/kio_desktop.cpp 2019-03-09 17:14:18.000000000 +0100 -+++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/kio_desktop.cpp 2019-03-10 14:10:36.955343591 +0100 -@@ -87,6 +87,10 @@ - QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), - desktopPath + "/.directory"); +--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/kioslave/desktop/kio_desktop.cpp 2021-01-21 14:41:53.000000000 +0100 ++++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/kio_desktop.cpp 2021-01-22 08:39:23.984081176 +0100 +@@ -83,6 +83,10 @@ + // Copy the .directory file + QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory"); + // Copy the trash link + QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.trash")), @@ -130,4 +130,4 @@ Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/kio + // Copy the desktop links QSet links; - const auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/DesktopLinks"), QStandardPaths::LocateDirectory); + const auto dirs = diff --git a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch index 0ce8a44..4062823 100644 --- a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +++ b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch @@ -8,11 +8,11 @@ Works around missing window decorations and broken config file reading startkde/startplasma-waylandsession.cpp | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6b3..5d0b3f65f 100644 ---- a/startkde/startplasma-waylandsession.cpp -+++ b/startkde/startplasma-waylandsession.cpp -@@ -45,6 +45,11 @@ int main(int /*argc*/, char** /*argv*/) +Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-waylandsession.cpp +=================================================================== +--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/startkde/startplasma-waylandsession.cpp 2021-01-21 14:41:53.000000000 +0100 ++++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-waylandsession.cpp 2021-01-22 08:39:19.900539408 +0100 +@@ -47,6 +47,11 @@ out << "startplasma-waylandsession: Starting up..."; if (qEnvironmentVariableIsSet("DISPLAY")) { @@ -24,6 +24,3 @@ index 87c71c6b3..5d0b3f65f 100644 setupX11(); } else { qWarning() << "running kwin without Xwayland support"; --- -2.22.0 - diff --git a/0001-Use-qdbus-qt5.patch b/0001-Use-qdbus-qt5.patch index 07a487d..186a25b 100644 --- a/0001-Use-qdbus-qt5.patch +++ b/0001-Use-qdbus-qt5.patch @@ -7,11 +7,11 @@ Subject: [PATCH] Use qdbus-qt5 startkde/startplasma-wayland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: plasma-workspace-5.15.80git.20200711T203602~d68c16b27/startkde/startplasma-wayland.cpp +Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-wayland.cpp =================================================================== ---- plasma-workspace-5.15.80git.20200711T203602~d68c16b27.orig/startkde/startplasma-wayland.cpp 2020-07-11 22:36:02.000000000 +0200 -+++ plasma-workspace-5.15.80git.20200711T203602~d68c16b27/startkde/startplasma-wayland.cpp 2020-07-12 10:44:19.999795526 +0200 -@@ -72,7 +72,7 @@ +--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/startkde/startplasma-wayland.cpp 2021-01-21 14:41:53.000000000 +0100 ++++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-wayland.cpp 2021-01-22 08:39:12.129799633 +0100 +@@ -62,7 +62,7 @@ runEnvironmentScripts(); if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) { diff --git a/0001-ksmserver-Enable-debug-output-by-default.patch b/0001-ksmserver-Enable-debug-output-by-default.patch new file mode 100644 index 0000000..d6d86e1 --- /dev/null +++ b/0001-ksmserver-Enable-debug-output-by-default.patch @@ -0,0 +1,28 @@ +From 056f5379830970dc2a7e12e3f16c898b384d5997 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Fri, 12 Feb 2021 18:00:45 +0100 +Subject: [PATCH] ksmserver: Enable debug output by default + +Sometimes logout just doesn't do anything (kde#432460). Debugging so far +didn't help as it made the issue disappear, so enable log output in general +so that either the issue disappears or there's useful output when it breaks. +--- + ksmserver/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt +index 34f943f5d..69dc58ac8 100644 +--- a/ksmserver/CMakeLists.txt ++++ b/ksmserver/CMakeLists.txt +@@ -18,7 +18,7 @@ set(ksmserver_SRCS + logout.cpp + client.cpp + ) +-ecm_qt_declare_logging_category(ksmserver_SRCS HEADER ksmserver_debug.h IDENTIFIER KSMSERVER CATEGORY_NAME org.kde.kf5.ksmserver) ++ecm_qt_declare_logging_category(ksmserver_SRCS HEADER ksmserver_debug.h IDENTIFIER KSMSERVER CATEGORY_NAME org.kde.kf5.ksmserver DEFAULT_SEVERITY Debug) + + qt5_add_dbus_adaptor( ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) + qt5_add_dbus_interface( ksmserver_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +-- +2.25.1 + diff --git a/plasma-workspace-5.20.5.tar.xz b/plasma-workspace-5.20.5.tar.xz deleted file mode 100644 index fdee733..0000000 --- a/plasma-workspace-5.20.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:357ef43092efb4d45f7c6ae9249a538be3484c855d0e35ae3b0b1e8d3db6c624 -size 9041964 diff --git a/plasma-workspace-5.20.5.tar.xz.sig b/plasma-workspace-5.20.5.tar.xz.sig deleted file mode 100644 index f59363b..0000000 --- a/plasma-workspace-5.20.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl/0XzIACgkQ7JTRj38F -mX7wWAf/bU0QzEhQvt9rosLtr5dd8L495oFBFK/Y/9vpOEHCH4+tQnkXsnGzwfGn -9GXDI6lT1mEixDAuVx2VCvukFEWxUn2js/rFOtEHJEPk9+FPPfw7ZYqIGSFEbyUo -otnrRfX/HkMUiy/eyWFY0eSlJD8M65dtix1OUZ4ltIHbG1n8kzp7BktCy19CG1D5 -52eReWxKY15QNxFrokoBW6pVxcX+doLw3U6tyrdkCVYEIJXu4LlQ0NR9OqeVui30 -zZzlLfW27E6325ZV0t0JIalVIJSz2KiQJvELSQSXqSWn9xKUuGEEvCmF36psXOid -azGoDgDX22nLXLOsXCwKQQiiHhsKrQ== -=7+vM ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.21.0.tar.xz b/plasma-workspace-5.21.0.tar.xz new file mode 100644 index 0000000..59f8572 --- /dev/null +++ b/plasma-workspace-5.21.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa7f0bbbad8a8b485f40746da13f7899bc69025f97b19dfa9e08352c6ca0cbd4 +size 9710020 diff --git a/plasma-workspace-5.21.0.tar.xz.sig b/plasma-workspace-5.21.0.tar.xz.sig new file mode 100644 index 0000000..24d437c --- /dev/null +++ b/plasma-workspace-5.21.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAlIVAACgkQ7JTRj38F +mX6m1Af/cOYUE2GqI/ms7hFNivYYUn5snmh/QTTrhYwe2rvAmFGA/2f67EsHyz8Q +XLTdGgEc3qPl3htmMNkf2IqNubf3XCs/Sq/XPf+sL09kUSSoivp75A9nXe0HJWCL +gZtn7mjxGEXbY9BWc07XbkCnw2BgM7jSGR/wVUXPFcQMRUc+IPcFxv4JcmrCfYIJ +eE9g3wxiGEluBP31f6+XzodtKlZ2qxdbSUfBOjDFzstS8It+Iwtmf63JCm91L70F +fxjTDAeISClDhrLjTLB0UpN4Nva8RdGBZant6wqbsaAfAlRPWikai7wQq0C0Al0p +KRbjFRe79Hq2h3FyEc36botmSPJk3w== +=ArB5 +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 2c5ca2c..fc5b944 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Thu Feb 11 18:23:15 UTC 2021 - Fabian Vogt + +- Update to 5.21.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.21.0 +- Changes since 5.20.90: + * fix restore size when float is used + * show colors,icons and plasma style in plamo + * [Notifications] Escape HTML in destUrl and fileName + * [Notifications] When application responds to cancel request, stop kill timer + * Fix condition for executable folders (kde#432653) + * ksmserver: Filter out services with NoDisplay=true + * Fix wallpaper paths in org.kde.slideshow package + * Revert "Use subseq matching for service runner" (kde#431609,kde#432339) + * [Notifications] Property is supposed to be "ProcessedItems" + * remove phone specific wallpaper config ui + * [applets/digital clock] Unbreak the time zone config dialog + * Set add panel as an explicit menu of a panel action (kde#432250) + * Wallpaper config: fix property imageModel that was missing in delegate (kde#431961) + * Make ksmserver's lock screen detection automatic + * [systemd] Move kwin to "wants" + * [applets/systemmonitor] fix not hiding the title on vertical panels + * [applets/digital clock] Restore scroll-to-change-displayed-timezone (kde#431977) + * Don't crash if the panelview is not ready + * [Notifications] Re-evaluate unread count when a notification is "read" + * [keyboard applet] fix TypeError garbage in log + * Fix condition for windowed widgets standalone mode (kde#432032) +- Add patch to either get more info or work around logout not working + sometimes (kde#432460): + * 0001-ksmserver-Enable-debug-output-by-default.patch + +------------------------------------------------------------------- +Thu Jan 21 21:31:48 UTC 2021 - Fabian Vogt + +- Update to 5.20.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/20.90/ +- Too many changes to list here +- Refresh patches: + * 0001-Revert-No-icons-on-the-desktop-by-default.patch + * 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch + * 0001-Use-qdbus-qt5.patch + ------------------------------------------------------------------- Fri Jan 15 10:54:18 UTC 2021 - Michel Normand diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index a7e0bb4..a86cbcc 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -16,12 +16,12 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates} - # Internal QML imports %global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm).* +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates} + %define kf5_version 5.58.0 %bcond_without lang @@ -30,16 +30,15 @@ Name: plasma5-workspace %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} -Version: 5.20.5 +Version: 5.21.0 Release: 0 -%global _plasma5_bugfix 5.20.1 Summary: The KDE Plasma Workspace Components License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org/ -Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz +Source: plasma-workspace-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig +Source1: plasma-workspace-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf @@ -47,6 +46,7 @@ Source3: baselibs.conf Patch501: 0001-Use-qdbus-qt5.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +Patch504: 0001-ksmserver-Enable-debug-output-by-default.patch # PATCH-FEATURE-OPENSUSE Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch BuildRequires: breeze5-icons @@ -91,7 +91,8 @@ BuildRequires: cmake(KF5Wallet) >= %{kf5_version} BuildRequires: cmake(KF5Wayland) >= %{kf5_version} BuildRequires: cmake(KF5XmlRpcClient) BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version} -BuildRequires: cmake(KUserFeedback) +# Disabled until upstream complies with the KDE policies +#BuildRequires: cmake(KUserFeedback) BuildRequires: cmake(Phonon4Qt5) >= 4.6.60 BuildRequires: cmake(PlasmaWaylandProtocols) >= 1.1.0 #!BuildIgnore: kdialog @@ -343,13 +344,24 @@ Plasma 5 session with Wayland from a display manager. touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop - # Backport of https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/588 - rm -r %{buildroot}%{_kf5_plasmadir}/wallpapers/org.kde.image/platformcontents/touch - %fdupes %{buildroot}/%{_prefix} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +%{systemd_user_post plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \ + plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \ + plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service} + +%preun +%{systemd_user_preun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \ + plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \ + plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service} + +%postun +/sbin/ldconfig +%{systemd_user_postun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \ + plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \ + plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -433,8 +445,8 @@ fi %{_kf5_libdir}/libkdeinit5_kcminit.so %{_kf5_libdir}/libkdeinit5_kcminit_startup.so %{_kf5_libdir}/libkdeinit5_klipper.so -%{_kf5_libdir}/kconf_update_bin/krunnerplugins %{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts +%{_kf5_libdir}/kconf_update_bin/krunnerhistory %{_kf5_libdir}/libexec/baloorunner %{_kf5_libdir}/libexec/plasma-sourceenv.sh %{_kf5_libdir}/libexec/startplasma-waylandsession @@ -448,7 +460,7 @@ fi %{_kf5_applicationsdir}/plasma-windowed.desktop %{_kf5_configkcfgdir}/freespacenotifier.kcfg %{_kf5_configkcfgdir}/iconssettingsbase.kcfg -%{_kf5_configkcfgdir}/feedbacksettings.kcfg +# %%{_kf5_configkcfgdir}/feedbacksettings.kcfg %dir %{_kf5_sharedir}/krunner/ %dir %{_kf5_sharedir}/krunner/dbusplugins/ %{_kf5_sharedir}/kcontrol/ @@ -459,11 +471,11 @@ fi %{_kf5_sharedir}/dbus-1/services/org.kde.fontinst.service %{_kf5_sharedir}/dbus-1/system-services/org.kde.fontinst.service %{_kf5_sharedir}/dbus-1/services/org.kde.LogoutPrompt.service -%{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service %{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service %{_kf5_sharedir}/dbus-1/services/org.kde.KSplash.service %{_kf5_sharedir}/dbus-1/services/org.kde.Shutdown.service +%{_kf5_sharedir}/dbus-1/services/org.kde.runners.baloo.service %{_kf5_sharedir}/dbus-1/system.d/org.kde.fontinst.conf %{_kf5_sharedir}/desktop-directories/ %{_kf5_sharedir}/kconf_update/ @@ -500,7 +512,7 @@ fi %dir %{_kf5_sharedir}/kpackage %dir %{_kf5_sharedir}/kpackage/kcms %{_kf5_sharedir}/kpackage/kcms/kcm_translations -%{_kf5_sharedir}/kpackage/kcms/kcm_feedback +# %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback %{_kf5_sharedir}/kpackage/kcms/kcm5_icons %{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme %dir %{_kf5_libdir}/libexec/kauth @@ -513,6 +525,19 @@ fi %exclude %{_kf5_libdir}/libkfontinstui.so %{_kf5_libdir}/libkfontinstui.so.* +%{_userunitdir}/plasma-gmenudbusmenuproxy.service +%{_userunitdir}/plasma-kcminit-phase1.service +%{_userunitdir}/plasma-kcminit.service +%{_userunitdir}/plasma-krunner.service +%{_userunitdir}/plasma-ksmserver.service +%{_userunitdir}/plasma-ksplash-ready.service +%{_userunitdir}/plasma-plasmashell.service +%{_userunitdir}/plasma-restoresession.service +%{_userunitdir}/plasma-baloorunner.service +%{_userunitdir}/plasma-workspace@.target +%{_userunitdir}/plasma-xembedsniproxy.service +%{_userunitdir}/plasma-core.target + %files -n xembedsniproxy %license COPYING* %{_kf5_bindir}/xembedsniproxy