[PR PATCH] nextcloud-client: update to 3.3.5, webengine is optional again

[PR PATCH] nextcloud-client: update to 3.3.5, webengine is optional again

[yopito]

[-- Attachment #1: Type: text/plain, Size: 1748 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages nextcloud.335
https://github.com/void-linux/void-packages/pull/33358

nextcloud-client: update to 3.3.5, webengine is optional again
upstream officially supports build without webengine.
webengine option is disabled for known non-matching architectures.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/33358.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.335-33358.patch --]
[-- Type: text/x-diff, Size: 4211 bytes --]

From 66d0a66938bce152ca656f7511d7328fcab664d8 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 5 Oct 2021 23:25:37 +0200
Subject: [PATCH] nextcloud-client: update to 3.3.5, 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 <pierre.bourgin@free.fr>
-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..e7d356bfa31d 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.5
 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 <pierre.bourgin@free.fr>"
 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=5e952be36ab6806ffbab6d216b05bfbd9d7e72687e0d281f492e1059cd34b419
+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

Re: [PR REVIEW] nextcloud-client: update to 3.3.5, webengine is optional again

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33358#discussion_r723800495

Comment:
Please add a comment explaining why.

Re: [PR REVIEW] nextcloud-client: update to 3.3.5, webengine is optional again

[yopito]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549

Comment:
I don't have the details anymore, but previous CI builds always failed on check, while my local checks are always fine.
For instance https://github.com/void-linux/void-packages/pull/30242 or https://github.com/void-linux/void-packages/pull/31725 (CI logs are not available anymore).

build log of my successful local check: https://gist.github.com/yopito/6cc7009da710c451e30af193688cf6e5

Re: [PR PATCH] [Merged]: nextcloud-client: update to 3.3.5, webengine is optional again

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]

There's a merged pull request on the void-packages repository

nextcloud-client: update to 3.3.5, webengine is optional again
https://github.com/void-linux/void-packages/pull/33358

Description:
upstream officially supports build without webengine.
webengine option is disabled for known non-matching architectures.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl