From e6a514cb05464d35e6bc65eaaabd606b20f100e3 Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 24 Aug 2021 20:10:43 +0200 Subject: [PATCH] nextcloud-client: update to 3.3.2, webengine is optional again upstream officially supports build without webengine. webengine option is disabled for known non-matching architectures. --- ...ariadic-macro-warning-only-for-clang.patch | 36 ------------------- srcpkgs/nextcloud-client/template | 17 ++++++--- 2 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch deleted file mode 100644 index 5afd721f392c..000000000000 --- a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch +++ /dev/null @@ -1,36 +0,0 @@ -source: https://github.com/nextcloud/desktop/pull/3132 - -From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001 -From: yopito -Date: Wed, 14 Apr 2021 22:07:19 +0200 -Subject: [PATCH] clang's variadic macro warnings: only for clang - -following settings of cmake/modules/Warnings.cmake ---- - src/CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git src/CMakeLists.txt src/CMakeLists.txt -index f29349582..6f3145331 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -30,10 +30,12 @@ if(NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") - endif() - -- # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU -- # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ if (CMAKE_CXX_COMPILER MATCHES "Clang") -+ # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU -+ # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ endif() - endif() - - if(WIN32) --- -2.31.1 - diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index ff2199b915d5..e13e8c1b20d0 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,6 +1,6 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.2.3 +version=3.3.2 revision=1 wrksrc="desktop-${version}" build_style=cmake @@ -10,7 +10,7 @@ makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel $(vopt_if dolphin 'extra-cmake-modules kio-devel') - qt5-webengine-devel" + $(vopt_if webengine 'qt5-webengine-devel')" depends="qt5-graphicaleffects" checkdepends="cmocka-devel" conf_files="/etc/Nextcloud/sync-exclude.lst" @@ -18,13 +18,22 @@ short_desc="NextCloud Desktop client" maintainer="yopito " 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=40dc6fe3aaa62851af3fa480f108cc7e3bfff64b6bea0602e9546359b3d2cba2 +checksum=6ea5ccc9579339f2d1652f26582dbdd8212dd5e0c28659dce7fe9ddece8a59c5 +make_check=ci-skip -build_options="dolphin" +build_options="dolphin webengine" desc_option_dolphin="Build KDE dolphin support" +desc_option_webengine="Build Qt5 WebEngine support" build_options_default="dolphin" +if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then + if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then + build_options_default+=" webengine" + fi +fi + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools" # provides desktoptojson