Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] owncloudclient: update to 2.8.2.
@ 2021-06-05 16:44 tornaria
  2021-06-17  3:12 ` ericonr
  2021-06-17  3:12 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: tornaria @ 2021-06-05 16:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/31315

owncloudclient: update to 2.8.2.
#### 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

One test fails, but I believe it was failing before.

I had to add a trivial patch which I reported upstream (https://github.com/owncloud/client/pull/8684).

NOTE: without the patch, even the current version (2.7.1_2) fails to compile.

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

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

From f7d590221349a17a6ce25bd3438090b1941e23f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 5 Jun 2021 13:40:24 -0300
Subject: [PATCH] owncloudclient: update to 2.8.2.

---
 ...9a352063f372a1573d326a80bd79ff4d5c37.patch | 28 +++++++++++++++++++
 srcpkgs/owncloudclient/template               |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch

diff --git a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
new file mode 100644
index 000000000000..78bbcfbd3b8b
--- /dev/null
+++ b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
@@ -0,0 +1,28 @@
+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
+--- src/csync/csync_exclude.cpp
++++ 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/template b/srcpkgs/owncloudclient/template
index a4f847a28fb3..2146b9110d17 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,7 +1,7 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.7.1
-revision=2
+version=2.8.2
+revision=1
 wrksrc=client-${version}
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=TRUE"
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=77fe458edeb141fd93bf713f1fa1412f2d7cc7ccae26de816e09d9b5168a5293
+checksum=aafc6044a4c6727ad747195cb90a6be8c3a5b28de50df97fa961b6b551fe6d89
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: owncloudclient: update to 2.8.2.
  2021-06-05 16:44 [PR PATCH] owncloudclient: update to 2.8.2 tornaria
@ 2021-06-17  3:12 ` ericonr
  2021-06-17  3:12 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-06-17  3:12 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31315#issuecomment-862883831

Comment:
Nice find !

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: owncloudclient: update to 2.8.2.
  2021-06-05 16:44 [PR PATCH] owncloudclient: update to 2.8.2 tornaria
  2021-06-17  3:12 ` ericonr
@ 2021-06-17  3:12 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-06-17  3:12 UTC (permalink / raw)
  To: ml

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

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

owncloudclient: update to 2.8.2.
https://github.com/void-linux/void-packages/pull/31315

Description:
#### 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

One test fails, but I believe it was failing before.

I had to add a trivial patch which I reported upstream (https://github.com/owncloud/client/pull/8684).

NOTE: without the patch, even the current version (2.7.1_2) fails to compile.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-06-17  3:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-05 16:44 [PR PATCH] owncloudclient: update to 2.8.2 tornaria
2021-06-17  3:12 ` ericonr
2021-06-17  3:12 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).