From a57b7f9c143b0dd11f6adda57d32cf2628eeb439 Mon Sep 17 00:00:00 2001 From: yopito Date: Sat, 13 May 2017 18:55:22 +0200 Subject: [PATCH] kcoreaddons: update to 5.36.0. --- .../patches/desktoptojson-usage-crossbuild.patch | 16 ++++++++++++++++ srcpkgs/kcoreaddons/template | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch diff --git a/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch b/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch new file mode 100644 index 00000000000..66ffbc4afa3 --- /dev/null +++ b/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch @@ -0,0 +1,16 @@ +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. + +--- KF5CoreAddonsMacros.cmake.ORIG ++++ KF5CoreAddonsMacros.cmake +@@ -45,7 +45,8 @@ + _desktop_to_json_cmake28(${desktop} ${json} ${DESKTOP_TO_JSON_COMPAT_MODE}) + return() + endif() +- set(command KF5::desktoptojson -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) + list(APPEND command -c) + endif() diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index efff858e721..76c097067fc 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,18 +1,18 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.29.0 +version=5.36.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" -makedepends="qt5-devel qt5-tools-devel" +makedepends="qt5-devel qt5-tools-devel gamin-devel" depends="shared-mime-info" short_desc="Qt5 addon library with a collection of non-GUI utilities" maintainer="Denis Revin " license="LGPL-2" homepage="https://projects.kde.org/projects/frameworks/kcoreaddons" distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e28b39fada9b19b03c7c79fc7ac337c1b943b33dbb40967a5cc7ba9f314cb3f6 +checksum=9d4b26bf22d1326c37f33aa4727942325cad2b23e5b3f1e32ec9ee558e9b5594 kcoreaddons-devel_package() { short_desc+=" - development"