From f635fd61f7d0e231261e7b8aab02a9e4fc7b38aa Mon Sep 17 00:00:00 2001 From: yopito Date: Sun, 14 May 2017 12:44:01 +0200 Subject: [PATCH] kwallet: update to 5.36.0. --- common/shlibs | 1 + .../patches/kwalletd-cmake-kwallet_xml.patch | 14 ++++++++++++++ srcpkgs/kwallet/template | 8 ++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/kwallet/patches/kwalletd-cmake-kwallet_xml.patch diff --git a/common/shlibs b/common/shlibs index 04f183d7c3a..826ad227236 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2594,6 +2594,7 @@ libKF5JobWidgets.so.5 kjobwidgets-5.26.0_1 libKF5Notifications.so.5 knotifications-5.26.0_1 libKF5TextWidgets.so.5 ktextwidgets-5.26.0_1 libKF5Wallet.so.5 kwallet-5.26.0_1 +libkwalletbackend5.so.5 kwallet-5.36.0_1 libKF5XmlGui.so.5 kxmlgui-5.26.0_1 libKF5Bookmarks.so.5 kbookmarks-5.26.0_1 libKF5KIOWidgets.so.5 kio-5.26.0_1 diff --git a/srcpkgs/kwallet/patches/kwalletd-cmake-kwallet_xml.patch b/srcpkgs/kwallet/patches/kwalletd-cmake-kwallet_xml.patch new file mode 100644 index 00000000000..7c77e9b6793 --- /dev/null +++ b/srcpkgs/kwallet/patches/kwalletd-cmake-kwallet_xml.patch @@ -0,0 +1,14 @@ +For some reasons, cmake find_file() fails on cross-build (only). +Let's bypass cmake path computation. + +--- src/runtime/kwalletd/CMakeLists.txt.ORIG ++++ src/runtime/kwalletd/CMakeLists.txt +@@ -78,7 +78,7 @@ + ) + endif(Gpgmepp_FOUND) + +-find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet) ++set(kwallet_xml ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet/org.kde.KWallet.xml) + + qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD ) + diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index b93e100130f..f6f9ae626e4 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -1,6 +1,6 @@ # Template file for 'kwallet' pkgname=kwallet -version=5.29.0 +version=5.36.0 revision=1 build_style=cmake make_build_args="VERBOSE=1" @@ -12,7 +12,11 @@ maintainer="Denis Revin " license="LGPL-2" homepage="https://projects.kde.org/projects/frameworks/kwallet" distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=81f1d7593857e6b05614cab1fc11e9f6ce34cd0272773e8ddde2aff33eb24c96 +checksum=8782caeb8d75da67a84c8eddf1d28af19fb01ffc0bbf7a35c0240e22519ccabb + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" +fi kwallet-devel_package() { short_desc+=" - development"