diff --git a/0001-Fix-kcmfontinst-install-destination.patch b/0001-Fix-kcmfontinst-install-destination.patch deleted file mode 100644 index 716e21f..0000000 --- a/0001-Fix-kcmfontinst-install-destination.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f90d4d5548dfe2d75e83b8da91af9be0e261286b Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Sun, 30 May 2021 18:00:26 +0200 -Subject: [PATCH] Fix kcmfontinst install destination - -This reverts part of a8ec95411a9f6, KCModuleLoader can't load kcm_fontinst -if the library is installed in KDE_INSTALL_PLUGINDIR/kcms/; looks like that -only works for KCMs using QML. - -BUG: 436306 -FIXED-IN: 5.22.1 -(cherry picked from commit 81ae7f8e28389edcd08e247498c5ee9ad4977f83) ---- - kcms/kfontinst/kcmfontinst/CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/kcms/kfontinst/kcmfontinst/CMakeLists.txt b/kcms/kfontinst/kcmfontinst/CMakeLists.txt -index fca680926..99dbbd311 100644 ---- a/kcms/kfontinst/kcmfontinst/CMakeLists.txt -+++ b/kcms/kfontinst/kcmfontinst/CMakeLists.txt -@@ -18,8 +18,7 @@ target_link_libraries(kcm_fontinst - X11::X11 - ) - --set_target_properties(kcm_fontinst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") --install(TARGETS kcm_fontinst DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) -+install(TARGETS kcm_fontinst DESTINATION ${KDE_INSTALL_PLUGINDIR}) - install( FILES fontinst.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install( FILES kfontinst.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} ) - --- -2.25.1 - diff --git a/0001-krunerglobalshortcuts-Fix-migration-from-old-compone.patch b/0001-krunerglobalshortcuts-Fix-migration-from-old-compone.patch deleted file mode 100644 index d796035..0000000 --- a/0001-krunerglobalshortcuts-Fix-migration-from-old-compone.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c00d380ebe58d6c4c1765e33264d787f8ccef126 Mon Sep 17 00:00:00 2001 -From: David Redondo -Date: Fri, 11 Jun 2021 09:40:21 +0200 -Subject: [PATCH] krunerglobalshortcuts: Fix migration from old component - -When calling cleanUpComponent KGlobalAccel checks if there are no -shortcuts active, otherwise it will refuse to clean the component. -For a desktop file component (aka KServiceActionComponent) all -shortcuts are deactivated inside cleanUpComponent. For a regular -Component we have to do this manually. ---- - krunner/update/krunnerglobalshortcuts.cpp | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/krunner/update/krunnerglobalshortcuts.cpp b/krunner/update/krunnerglobalshortcuts.cpp -index af9ffbe1f..618502e34 100644 ---- a/krunner/update/krunnerglobalshortcuts.cpp -+++ b/krunner/update/krunnerglobalshortcuts.cpp -@@ -58,16 +58,24 @@ int main(int argc, char **argv) - - QList oldRunCommand; - QList oldRunClipboard; -- if (KGlobalAccel::isComponentActive(oldCompomentName)) { -- oldRunCommand = KGlobalAccel::self()->globalShortcut(oldCompomentName, QStringLiteral("run command")); -- oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldCompomentName, QStringLiteral("run command on clipboard contents")); -- KGlobalAccel::self()->cleanComponent(oldCompomentName); -- } else if (KGlobalAccel::isComponentActive(oldDesktopFile)) { -+ -+ // It can happen that the old component is not active so we do it unconditionally -+ KActionCollection oldActions(nullptr, oldCompomentName); -+ QAction oldRunCommandAction, oldRunClipboardAction; -+ oldActions.addAction(QStringLiteral("run command"), &oldRunCommandAction); -+ oldActions.addAction(QStringLiteral("run command on clipboard contents"), &oldRunClipboardAction); -+ oldRunCommand = KGlobalAccel::self()->globalShortcut(oldCompomentName, oldRunCommandAction.objectName()); -+ oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldCompomentName, oldRunClipboardAction.objectName()); -+ KGlobalAccel::self()->setShortcut(&oldRunCommandAction, {}); -+ KGlobalAccel::self()->setShortcut(&oldRunClipboardAction, {}); -+ KGlobalAccel::self()->removeAllShortcuts(&oldRunCommandAction); -+ KGlobalAccel::self()->removeAllShortcuts(&oldRunClipboardAction); -+ KGlobalAccel::self()->cleanComponent(oldCompomentName); -+ -+ if (KGlobalAccel::isComponentActive(oldDesktopFile)) { - oldRunCommand = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runCommandAction->objectName()); - oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runClipboardAction->objectName()); - KGlobalAccel::self()->cleanComponent(oldDesktopFile); -- } else { -- return 0; - } - - shortCutActions.takeAction(runCommandAction); --- -2.25.1 - diff --git a/0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch b/0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch deleted file mode 100644 index 3323695..0000000 --- a/0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c7bb5053b5581ac0f1439b07624050bbbcc5db5d Mon Sep 17 00:00:00 2001 -From: David Redondo -Date: Wed, 9 Jun 2021 13:48:20 +0200 -Subject: [PATCH] krunnerglobalshortcuts: Prevent actions from becoming - inactive - -If a QAction is destroyed, KGlobalAccel will automaticaly set it -to inactive. To prevent this put them on the heap and intentionally -leak them as it did before. -CCBUG:437364 ---- - krunner/update/krunnerglobalshortcuts.cpp | 24 ++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git a/krunner/update/krunnerglobalshortcuts.cpp b/krunner/update/krunnerglobalshortcuts.cpp -index 4ef1b05b5..af9ffbe1f 100644 ---- a/krunner/update/krunnerglobalshortcuts.cpp -+++ b/krunner/update/krunnerglobalshortcuts.cpp -@@ -49,10 +49,12 @@ int main(int argc, char **argv) - - KActionCollection shortCutActions(nullptr, oldDesktopFile); - shortCutActions.setComponentDisplayName(displayName); -- QAction runCommandAction(displayName); -- shortCutActions.addAction(QStringLiteral("_launch"), &runCommandAction); -- QAction runClipboardAction(clipboardActionName); -- shortCutActions.addAction(QStringLiteral("RunClipboard"), &runClipboardAction); -+ // The actions are intentionally allocated and never cleaned up, because otherwise KGlobalAccel -+ // will mark them as inactive -+ auto runCommandAction = new QAction(displayName); -+ shortCutActions.addAction(QStringLiteral("_launch"), runCommandAction); -+ auto runClipboardAction = new QAction(clipboardActionName); -+ shortCutActions.addAction(QStringLiteral("RunClipboard"), runClipboardAction); - - QList oldRunCommand; - QList oldRunClipboard; -@@ -61,23 +63,23 @@ int main(int argc, char **argv) - oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldCompomentName, QStringLiteral("run command on clipboard contents")); - KGlobalAccel::self()->cleanComponent(oldCompomentName); - } else if (KGlobalAccel::isComponentActive(oldDesktopFile)) { -- oldRunCommand = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runCommandAction.objectName()); -- oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runClipboardAction.objectName()); -+ oldRunCommand = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runCommandAction->objectName()); -+ oldRunClipboard = KGlobalAccel::self()->globalShortcut(oldDesktopFile, runClipboardAction->objectName()); - KGlobalAccel::self()->cleanComponent(oldDesktopFile); - } else { - return 0; - } - -- shortCutActions.takeAction(&runCommandAction); -- shortCutActions.takeAction(&runClipboardAction); -+ shortCutActions.takeAction(runCommandAction); -+ shortCutActions.takeAction(runClipboardAction); - shortCutActions.setComponentName(newDesktopFile); -- shortCutActions.addActions({&runCommandAction, &runClipboardAction}); -+ shortCutActions.addActions({runCommandAction, runClipboardAction}); - - if (!oldRunCommand.isEmpty()) { -- KGlobalAccel::self()->setShortcut(&runCommandAction, oldRunCommand, KGlobalAccel::NoAutoloading); -+ KGlobalAccel::self()->setShortcut(runCommandAction, oldRunCommand, KGlobalAccel::NoAutoloading); - } - if (!oldRunClipboard.isEmpty()) { -- KGlobalAccel::self()->setShortcut(&runClipboardAction, oldRunClipboard, KGlobalAccel::NoAutoloading); -+ KGlobalAccel::self()->setShortcut(runClipboardAction, oldRunClipboard, KGlobalAccel::NoAutoloading); - } - - return 0; --- -2.25.1 - diff --git a/plasma-workspace-5.22.0.tar.xz b/plasma-workspace-5.22.0.tar.xz deleted file mode 100644 index b616cbe..0000000 --- a/plasma-workspace-5.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ed41a30208d87f7586734fa0ee84eb308f5da57ea614ef537171eac8bbbb77c -size 8349176 diff --git a/plasma-workspace-5.22.0.tar.xz.sig b/plasma-workspace-5.22.0.tar.xz.sig deleted file mode 100644 index 4289212..0000000 --- a/plasma-workspace-5.22.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC+Pr4ACgkQ7JTRj38F -mX6qogf9ErnVm7HtIYov0pMb5VybHMPVxP3tS8RC2SxQ24KiHKyw0taTyFgn81GP -+Or12f/8z7NfEfn7MHVCg7+Fleenb7ITpE3PkSUvmTiNUtdu8fcowN35zweWMrrk -fseGhi+i1QX/6LUSAfOp7rajvAIsAmo484nHbbwd8LtFu2QVK92T5pCLINBi6Pji -Ngm3OPMsQ9ZX4xKbBPNlHn8L3QHs/Ew/dcrVBX1cIH5TMFh4H9T/S+tvbQvGQOJf -7Rmquxe9ZJ1F6kz8N+8xz0JVM52ND4116LtR9MOKIWB6U4wkWmAkvX4ymw9YJxgx -1hbCRtlrr4AX9JfAL0XEfiuNrdlvXw== -=T0vY ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.22.1.tar.xz b/plasma-workspace-5.22.1.tar.xz new file mode 100644 index 0000000..e81086a --- /dev/null +++ b/plasma-workspace-5.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61ad5adab412c935ae156c4de3f38d1e2640752c95100ad6996b9e51e8539725 +size 8349504 diff --git a/plasma-workspace-5.22.1.tar.xz.sig b/plasma-workspace-5.22.1.tar.xz.sig new file mode 100644 index 0000000..eec2ebc --- /dev/null +++ b/plasma-workspace-5.22.1.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmDIfQoACgkQ7JTRj38F +mX6zpAf8D9seGCySXRj30hzLKHPKi/mYYoqt9JpvXeFbDq08Lg8RGT/PbBZSFgFx +CuEkR4AdV26HdzfFcR3EBKg3qLSClSWeST80bqdh9JcBB+EylZQ62w/qOKWr4ERy +qkrNqyMxtm5amuh62LOPYuIxesKWL7+L1klnxq+b1cV2ImKWOnL7+1YvMekAIOi7 +HzL9EcFKbd+FOVi/46KYsXKCnG5FV5Zytifw76uaDLyP6NSpUj0FIM9jaSMgqb+G +N7fMlV+3dlB1OyYvVfVZ3sYXTyo216jJk1acKJt7Ln6I4WWcgAlcGMIysFDdCwxC +f91VRmp3IS7TN9i2LLKHeQ9vXEfXeA== +=QB2C +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index d6256bf..d293d46 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jun 15 14:15:50 UTC 2021 - Fabian Vogt + +- Update to 5.22.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.1 +- Changes since 5.22.0: + * [applets/devicenotifier] Don't show empty header most of the time (kde#438351) + * [kcms/autostart] Avoid empty application icon + * [libtaskmanager/x11] Fix transient windows bug (kde#438222) + * krunerglobalshortcuts: Fix migration from old component + * Recent Documents: Fix missing actions for results (kde#437462) + * [kcms/autostart] Keep capitalization of desktop file names (kde#438406) + * Point bbcukmet to new location API BUG: 430643 (kde#430643) + * krunnerglobalshortcuts: Prevent actions from becoming inactive + * Fix kcmfontinst install destination (kde#436306) +- Drop patches, now upstream: + * 0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch + * 0001-krunerglobalshortcuts-Fix-migration-from-old-compone.patch + * 0001-Fix-kcmfontinst-install-destination.patch + ------------------------------------------------------------------- Fri Jun 11 09:51:33 UTC 2021 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 9fcaae5..6a32a31 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -30,22 +30,18 @@ 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.22.0 +Version: 5.22.1 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org/ -Source: plasma-workspace-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz %if %{with lang} -Source1: plasma-workspace-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-kcmfontinst-install-destination.patch -Patch2: 0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch -Patch3: 0001-krunerglobalshortcuts-Fix-migration-from-old-compone.patch # PATCHES 501-??? are PATCH-FIX-OPENSUSE Patch501: 0001-Use-qdbus-qt5.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch