From 4f19890aad03c657f5d52ba4adf921f34e31c938 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 15 Jun 2021 18:49:21 +0200 Subject: [PATCH] plasma-workspace: update to 5.22.1. --- .../plasma-workspace/patches/f90d4d55.patch | 33 ------------------- srcpkgs/plasma-workspace/template | 6 ++-- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/plasma-workspace/patches/f90d4d55.patch diff --git a/srcpkgs/plasma-workspace/patches/f90d4d55.patch b/srcpkgs/plasma-workspace/patches/f90d4d55.patch deleted file mode 100644 index 551a011279d..00000000000 --- a/srcpkgs/plasma-workspace/patches/f90d4d55.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 ---- kcms/kfontinst/kcmfontinst/CMakeLists.txt -+++ 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} ) - --- -GitLab - diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index f7c2981201c..049bc5c1f28 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.22.0 -revision=2 +version=5.22.1 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner @@ -23,7 +23,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=1ed41a30208d87f7586734fa0ee84eb308f5da57ea614ef537171eac8bbbb77c +checksum=61ad5adab412c935ae156c4de3f38d1e2640752c95100ad6996b9e51e8539725 build_options="pipewire" build_options_default="pipewire"