snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

kcoreaddons: update to 5.91.0.

Browse source
This commit is contained in:
John 2022-01-18 12:26:07 +01:00
parent b6ecf1556b
commit d9d9849fd2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch
View file

@ -2,13 +2,13 @@ fix cmake code for cross-build usage.
Initial directive "command KF5::desktoptojson ..." points Initial directive "command KF5::desktoptojson ..." points
the target's arch desktoptojson binary instead of the host's one. the target's arch desktoptojson binary instead of the host's one.
--- a/KF5CoreAddonsMacros.cmake --- a/KF5CoreAddonsMacros.cmake 2022-02-05 22:20:29.000000000 +0100
+++ b/KF5CoreAddonsMacros.cmake +++ - 2022-02-13 23:13:24.523896883 +0100
@@ -45,7 +45,8 @@ @@ -46,7 +46,8 @@
_desktop_to_json_cmake28(${desktop} ${json} ${DESKTOP_TO_JSON_COMPAT_MODE})
return() return()
endif() 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) + get_target_property(DESKTOPTOJSON_LOCATION KF5::desktoptojson LOCATION)
+ set(command ${DESKTOPTOJSON_LOCATION} -i ${desktop} -o ${json}) + set(command ${DESKTOPTOJSON_LOCATION} -i ${desktop} -o ${json})
if(DESKTOP_TO_JSON_COMPAT_MODE) if(DESKTOP_TO_JSON_COMPAT_MODE)

4
srcpkgs/kcoreaddons/template
View file

@ -1,6 +1,6 @@
# Template file for 'kcoreaddons' # Template file for 'kcoreaddons'
pkgname=kcoreaddons pkgname=kcoreaddons
version=5.89.0 version=5.91.0
revision=1 revision=1
build_style=cmake build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later" license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kcoreaddons" homepage="https://invent.kde.org/frameworks/kcoreaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=e1d085786b6247e71f918b6d90ab8a4c09d37816ba296981858e8a8f3e3f426b checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b
post_install() { post_install() {
vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ vsed -e 's;${_IMPORT_PREFIX};/usr;g' \