[PR PATCH] nextcloud-client: update to 3.2.0

[PR PATCH] nextcloud-client: update to 3.2.0

[yopito]

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

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

https://github.com/yopito/void-packages nextcloud.320
https://github.com/void-linux/void-packages/pull/30242

nextcloud-client: update to 3.2.0
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 7edeb0dc8792b95013b3aea92e8b52d0a1329e57 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 12 Apr 2021 08:46:26 +0200
Subject: [PATCH] nextcloud-client: update to 3.2.0

---
 ...ariadic-macro-warning-only-for-clang.patch | 36 +++++++++++++++++++
 .../patches/test-check_vio.patch              | 15 --------
 srcpkgs/nextcloud-client/template             |  9 +++--
 3 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
 delete mode 100644 srcpkgs/nextcloud-client/patches/test-check_vio.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
new file mode 100644
index 000000000000..58d434318684
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
@@ -0,0 +1,36 @@
+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
+--- src/CMakeLists.txt
++++ 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/patches/test-check_vio.patch b/srcpkgs/nextcloud-client/patches/test-check_vio.patch
deleted file mode 100644
index 82d78843b966..000000000000
--- a/srcpkgs/nextcloud-client/patches/test-check_vio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fails if runned from within a github actions, so disable it.
-NB: works fine on regular personnal xbps-src usage.
-
---- test/csync/vio_tests/check_vio.cpp.ORIG	2020-12-22 10:54:32.000000000 +0100
-+++ test/csync/vio_tests/check_vio.cpp	2020-12-26 15:16:07.118993372 +0100
-@@ -122,9 +122,6 @@
-     rc = _tmkdir(dir, (S_IWUSR|S_IXUSR));
-     assert_int_equal(rc, 0);
- 
--    dh = csync_vio_opendir(csync, CSYNC_TEST_DIR);
--    assert_null(dh);
--    assert_int_equal(errno, EACCES);
- 
-     _tchmod(dir, MKDIR_MASK);
-     c_free_locale_string(dir);
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 2382d7d337f9..cd130c14be8d 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,10 +1,10 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.1.2
-revision=2
+version=3.2.0
+revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DNO_SHIBBOLETH=True"
+configure_args="-Wno-dev"
 hostmakedepends="pkg-config"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
@@ -19,7 +19,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189
+checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60
 
 build_options="dolphin"
 desc_option_dolphin="Build KDE dolphin support"
@@ -77,6 +77,5 @@ nextcloud-client-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libnextcloudsync.so
-		vmove "usr/lib/nextcloud/*.so"
 	}
 }

Re: nextcloud-client: update to 3.2.0

[yopito]

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

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30242#issuecomment-820164703

Comment:
as usual, NC tests fails while building on GH actions while running fine on my own build and test.

Re: nextcloud-client: update to 3.2.0

[yopito]

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

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30242#issuecomment-820164703

Comment:
as usual, some NC tests fails while building on GH actions while running fine on my own build and test.

Re: [PR PATCH] [Merged]: nextcloud-client: update to 3.2.0

[ericonr]

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

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

nextcloud-client: update to 3.2.0
https://github.com/void-linux/void-packages/pull/30242

Description:
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: nextcloud-client: update to 3.2.0.

[codingHahn]

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

New comment by codingHahn on void-packages repository

https://github.com/void-linux/void-packages/pull/30417#issuecomment-824616575

Comment:
Sorry, haven't looked for existing prs

Re: nextcloud-client: update to 3.2.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30417#issuecomment-824407882

Comment:
Done in #30242