From d9d9849fd2ce13634373452aa6aee57b2a6fd77c Mon Sep 17 00:00:00 2001 From: John Date: Tue, 18 Jan 2022 12:26:07 +0100 Subject: [PATCH] kcoreaddons: update to 5.91.0. --- .../patches/desktoptojson-usage-crossbuild.patch | 10 +++++----- srcpkgs/kcoreaddons/template | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch b/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch index b5781945c5a..8e976cf4ef7 100644 --- a/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch +++ b/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch @@ -2,13 +2,13 @@ fix cmake code for cross-build usage. Initial directive "command KF5::desktoptojson ..." points the target's arch desktoptojson binary instead of the host's one. ---- a/KF5CoreAddonsMacros.cmake -+++ b/KF5CoreAddonsMacros.cmake -@@ -45,7 +45,8 @@ - _desktop_to_json_cmake28(${desktop} ${json} ${DESKTOP_TO_JSON_COMPAT_MODE}) +--- a/KF5CoreAddonsMacros.cmake 2022-02-05 22:20:29.000000000 +0100 ++++ - 2022-02-13 23:13:24.523896883 +0100 +@@ -46,7 +46,8 @@ return() endif() -- set(command KF5::desktoptojson -i ${desktop} -o ${json}) + kcoreaddons_desktop_to_json_crosscompilation_args(_crosscompile_args) +- set(command KF5::desktoptojson ${_crosscompile_args} -i ${desktop} -o ${json}) + get_target_property(DESKTOPTOJSON_LOCATION KF5::desktoptojson LOCATION) + set(command ${DESKTOPTOJSON_LOCATION} -i ${desktop} -o ${json}) if(DESKTOP_TO_JSON_COMPAT_MODE) diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index fec84b93b4d..78ba6540324 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.89.0 +version=5.91.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcoreaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e1d085786b6247e71f918b6d90ab8a4c09d37816ba296981858e8a8f3e3f426b +checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \