plasma-workspace: update to 5.22.1.

This commit is contained in:
John 2021-06-15 18:49:21 +02:00
parent 43f76dcc9d
commit 4f19890aad
2 changed files with 3 additions and 36 deletions

View file

@ -1,33 +0,0 @@
From f90d4d5548dfe2d75e83b8da91af9be0e261286b Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
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

View file

@ -1,7 +1,7 @@
# Template file for 'plasma-workspace' # Template file for 'plasma-workspace'
pkgname=plasma-workspace pkgname=plasma-workspace
version=5.22.0 version=5.22.1
revision=2 revision=1
build_style=cmake build_style=cmake
configure_args="-DBUILD_TESTING=OFF configure_args="-DBUILD_TESTING=OFF
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/plasma-workspace" homepage="https://invent.kde.org/plasma/plasma-workspace"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
checksum=1ed41a30208d87f7586734fa0ee84eb308f5da57ea614ef537171eac8bbbb77c checksum=61ad5adab412c935ae156c4de3f38d1e2640752c95100ad6996b9e51e8539725
build_options="pipewire" build_options="pipewire"
build_options_default="pipewire" build_options_default="pipewire"