From 4caeef7b7ab13909dec8c687dadd6d9600361ff4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Jun 2021 12:41:00 +0200 Subject: [PATCH] plasma-workspace: backport upstream patch to fix font management closes #31434 --- .../plasma-workspace/patches/f90d4d55.patch | 33 +++++++++++++++++++ srcpkgs/plasma-workspace/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/plasma-workspace/patches/f90d4d55.patch diff --git a/srcpkgs/plasma-workspace/patches/f90d4d55.patch b/srcpkgs/plasma-workspace/patches/f90d4d55.patch new file mode 100644 index 00000000000..551a011279d --- /dev/null +++ b/srcpkgs/plasma-workspace/patches/f90d4d55.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 +--- 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 4cf5b1cfdee..f7c2981201c 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=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner