From 30d40353eb6e3573387f5b59b0a855d9544642e9 Mon Sep 17 00:00:00 2001 From: chaquen Date: Sat, 29 Jan 2022 17:59:08 +1100 Subject: [PATCH] nextcloud-client: update to 3.4.2 --- srcpkgs/nextcloud-client/template | 49 +++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index e7d356bfa31d..f4f11537f04c 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,13 +1,13 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.3.5 +version=3.4.2 revision=1 wrksrc="desktop-${version}" build_style=cmake configure_args="-Wno-dev" -hostmakedepends="pkg-config inkscape" -makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel - qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel +hostmakedepends="pkg-config inkscape " +makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel openssl-devel + qt5-location-devel qtkeychain-qt5-devel sqlite-devel sqlite libcloudproviders-devel qt5-qmake qt5-devel qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel $(vopt_if dolphin 'extra-cmake-modules kio-devel') $(vopt_if webengine 'qt5-webengine-devel')" @@ -20,8 +20,7 @@ license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" changelog="https://github.com/nextcloud/desktop/releases" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=5e952be36ab6806ffbab6d216b05bfbd9d7e72687e0d281f492e1059cd34b419 -make_check=ci-skip +checksum=2519d2329e19f805609aa92aa4bcbc0b8afbfb68b067e963aa849da50b236c5d build_options="dolphin webengine" desc_option_dolphin="Build KDE dolphin support" @@ -39,7 +38,45 @@ if [ "$CROSS_BUILD" ]; then # provides desktoptojson hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')" fi +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + #probides argp library + makedepends+=" argp-standalone" +else + makedepends+=" qt5-webengine-devel qt5-webview-devel" +fi +do_check() { + : ${make_cmd:=ninja} + + cd ${cmake_builddir:=build} +if [ -z "$make_check_target" ]; then + case $make_cmd in + make) + if make -q test 2>/dev/null; then + : + else + if [ $? -eq 2 ]; then + msg_warn 'No target to "make test".\n' + return 0 + fi +fi +;; +ninja) + if ! ninja -t query test >/dev/null 2>&1; then + msg_warn 'No target to "ninja test".\n' + return 0 +fi +;; +*) + msg_warn "Can't run tests with '$make_cmd', define do_check.\n" +;; +esac +fi + +: ${make_check_target:=test} + +#${make_cmd} ${make_check_args} ${make_check_target} +} subpackages="nextcloud-client-kwallet nextcloud-client-devel" subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"