[PR PATCH] owncloudclient: update to 2.9.1, fix tests

[tornaria <tornaria@users.noreply.github.com>]

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/34131

owncloudclient: update to 2.9.1, fix tests
- I tested the changes in this PR: **YES** (I'm running it since yesterday, with my own files in two different accounts)
- I removed a patch that has been merged upstream
- I added a patch to skip two tests that were failing because xbps-src runs with root permission (the tests try to write to `/` and `/usr/bin` and expect to get a permission error). Now the check stage should succeed (I only tested in x86_64, let's see what CI says).
- Added `changelog=`

CC: @ndowens 

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

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

From b7ca6d9a488f79a3557bf9644e5a4d030fd647bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 17 Nov 2021 23:09:45 -0300
Subject: [PATCH] owncloudclient: update to 2.9.1.

---
 ...9a352063f372a1573d326a80bd79ff4d5c37.patch | 28 -------------------
 .../patches/skip-root-test.patch              | 16 +++++++++++
 srcpkgs/owncloudclient/template               |  5 ++--
 3 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
 create mode 100644 srcpkgs/owncloudclient/patches/skip-root-test.patch

diff --git a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
deleted file mode 100644
index 536db5f230cd..000000000000
--- a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Reported upstream: https://github.com/owncloud/client/pull/8684
-
-From 89e59a352063f372a1573d326a80bd79ff4d5c37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@gmail.com>
-Date: Sat, 5 Jun 2021 13:27:13 -0300
-Subject: [PATCH] Fix use of deleted function
-
-Compilation fails due to implicit cast to QChar
-
-Compilation on void linux (qt 5.15.3+20210429) fails with
-csync_exclude.cpp:489:34: error: use of deleted function 'QCharRef& QCharRef::operator=(char)'
----
- src/csync/csync_exclude.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
-index 586035346b7..c5c7bbccf5c 100644
---- a/src/csync/csync_exclude.cpp
-+++ b/src/csync/csync_exclude.cpp
-@@ -488,7 +488,7 @@ QString ExcludedFiles::convertToRegexpSyntax(QString exclude, bool wildcardsMatc
-             // Translate [! to [^
-             QString bracketExpr = exclude.mid(i, j - i + 1);
-             if (bracketExpr.startsWith(QLatin1String("[!")))
--                bracketExpr[1] = '^';
-+                bracketExpr[1] = QLatin1Char('^');
-             regex.append(bracketExpr);
-             i = j;
-             break;
diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
new file mode 100644
index 000000000000..6a572c9e5607
--- /dev/null
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -0,0 +1,16 @@
+Skip a couple of tests that assume we don't have root permissions.
+
+--- a/test/testfolderman.cpp
++++ b/test/testfolderman.cpp
+@@ -102,9 +102,9 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+ 
+         // Should not have the rights
+-        QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
+-        QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
++        //QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
++        //QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+ #endif
+ 
+ #ifdef Q_OS_WIN // drive-letter tests
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 2146b9110d17..6731ba6409da 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.8.2
+version=2.9.1
 revision=1
 wrksrc=client-${version}
 build_style=cmake
@@ -15,8 +15,9 @@ short_desc="Connect to ownCloud servers"
 maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
+changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=aafc6044a4c6727ad747195cb90a6be8c3a5b28de50df97fa961b6b551fe6d89
+checksum=fe19a24efeafb1e89c2857398d128ed056b07161e49867db503e40ed222d6022
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"