diff --git a/0001-Fix-kcmfontinst-install-destination.patch b/0001-Fix-kcmfontinst-install-destination.patch new file mode 100644 index 0000000..716e21f --- /dev/null +++ b/0001-Fix-kcmfontinst-install-destination.patch @@ -0,0 +1,33 @@ +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-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch b/0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch new file mode 100644 index 0000000..3323695 --- /dev/null +++ b/0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch @@ -0,0 +1,69 @@ +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 index 39a59e0..b616cbe 100644 --- a/plasma-workspace-5.22.0.tar.xz +++ b/plasma-workspace-5.22.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a80c5245f9427b26829dd63e18e22066d965df79ce111c1bf53eb474a881cede -size 8349256 +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 index ea88c54..4289212 100644 --- a/plasma-workspace-5.22.0.tar.xz.sig +++ b/plasma-workspace-5.22.0.tar.xz.sig @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC45VAACgkQ7JTRj38F -mX4cAwf9H7u3cRdDBnQFyT6S/PzBUM7wCP8bvlrrlwe4aupMASvR7KOJzfIHaAZE -5O7LBWPVL8WMjdto/UWKyJwdFnqYWPrK6GSkMv/L7Mjkxq2gge4GUNDH5vDhGXs9 -PxVWcc3FovmM6xljSWfnbks5Ev6fTfsd/MBR4wQaO8NAGf2vmqZCCIw0UotJdmkj -rdRPHLltVcheoBiZbZz+4a75D7jj4pFO/gWDhlle54h/gN/vrPbiRrIyzj9/lpv8 -gYl438R2eLKhb7PLqiK52Y/yq6MlYCIxZrT9NymtlpW+VndK+w+KLcDGPPAV8tNI -TCddAqd1OG4jXDum15zEG7bN14IQkQ== -=iRmQ +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC+Pr4ACgkQ7JTRj38F +mX6qogf9ErnVm7HtIYov0pMb5VybHMPVxP3tS8RC2SxQ24KiHKyw0taTyFgn81GP ++Or12f/8z7NfEfn7MHVCg7+Fleenb7ITpE3PkSUvmTiNUtdu8fcowN35zweWMrrk +fseGhi+i1QX/6LUSAfOp7rajvAIsAmo484nHbbwd8LtFu2QVK92T5pCLINBi6Pji +Ngm3OPMsQ9ZX4xKbBPNlHn8L3QHs/Ew/dcrVBX1cIH5TMFh4H9T/S+tvbQvGQOJf +7Rmquxe9ZJ1F6kz8N+8xz0JVM52ND4116LtR9MOKIWB6U4wkWmAkvX4ymw9YJxgx +1hbCRtlrr4AX9JfAL0XEfiuNrdlvXw== +=T0vY -----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index a25745d..122721a 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 9 12:00:42 UTC 2021 - Fabian Vogt + +- Add patch to fix migration of krunner shortcuts (kde#437364): + * 0001-krunnerglobalshortcuts-Prevent-actions-from-becoming.patch + +------------------------------------------------------------------- +Tue Jun 8 20:46:37 UTC 2021 - Fabian Vogt + +- Add back patch which was mistakenly not part of the tarball: + * 0001-Fix-kcmfontinst-install-destination.patch + +------------------------------------------------------------------- +Tue Jun 8 06:52:58 UTC 2021 - Fabian Vogt + +- Update to new 5.22.0 tarball: + * [System Tray] Fix typo breaking sorting notification applet first (kde#438146) + ------------------------------------------------------------------- Thu Jun 3 13:06:17 UTC 2021 - Fabian Vogt @@ -7,7 +25,7 @@ Thu Jun 3 13:06:17 UTC 2021 - Fabian Vogt * https://kde.org/announcements/plasma/5/5.22.0 - Too many changes to list here - Drop patches, now upstream: - * 0001-Fix-kcmfontinst-install-destination.patch + * 0001-Fix-kcmfontinst-install-destination.patch ------------------------------------------------------------------- Mon May 31 06:20:16 UTC 2021 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 0ffdd4d..2d2e5d9 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -42,6 +42,9 @@ Source1: 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 # PATCHES 501-??? are PATCH-FIX-OPENSUSE Patch501: 0001-Use-qdbus-qt5.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch