[arch-commits] Commit in owncloud-client/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, May 25, 2021 @ 20:12:43
  Author: arojas
Revision: 946300

Update to 2.8.1

Added:
  owncloud-client/trunk/fix-build-glib2.patch
  owncloud-client/trunk/fix-build-qt.patch
Modified:
  owncloud-client/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   16 ++++++++++++----
 fix-build-glib2.patch |   21 +++++++++++++++++++++
 fix-build-qt.patch    |   13 +++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-25 20:12:08 UTC (rev 946299)
+++ PKGBUILD	2021-05-25 20:12:43 UTC (rev 946300)
@@ -2,7 +2,7 @@
 # Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 
 pkgname=owncloud-client
-pkgver=2.7.6.3261
+pkgver=2.8.1.4157
 pkgrel=1
 pkgdesc='ownCloud client based on mirall'
 arch=(x86_64)
@@ -12,11 +12,19 @@
 makedepends=(extra-cmake-modules python-sphinx qt5-tools doxygen kio)
 optdepends=('python-nautilus: integration with Nautilus' 'nemo-python: integration with Nemo' 'python-caja: integration with Caja')
 backup=('etc/ownCloud/sync-exclude.lst')
-source=(https://download.owncloud.com/desktop/ownCloud/stable/$pkgver/source/ownCloud-$pkgver.tar.xz{,.asc})
-sha256sums=('7e8b41720074670197a3642db1b63a57e05e753c4815c9032c9b78f817a452a6'
-            'SKIP')
+source=(https://download.owncloud.com/desktop/ownCloud/stable/$pkgver/source/ownCloud-$pkgver.tar.xz{,.asc}
+        fix-build-qt.patch fix-build-glib2.patch)
+sha256sums=('1b00d0b8287c3eee2634bec5190b7adb9d80ee661352d4c94234cb0b20cab459'
+            'SKIP'
+            '1dd13fd494dae3f5639a42df2c55f76897457de82be0e7601d09efabbddd3be0'
+            '091b40721869e0bb38fae7d4e0bb0baf2a4aaaa1c6cdceec52e6a44aa6065e98')
 validpgpkeys=(F05F7DD7953A07DF36579DAA498C45EBE94E7B37) # ownCloud Client Team (Signing Key) <info at owncloud.com>
 
+prepare() {
+  patch -d ownCloud-$pkgver -p1 < fix-build-qt.patch # Fix build with recent Qt
+  patch -d ownCloud-$pkgver -p1 < fix-build-glib2.patch # Fix build with glib 2.68
+}
+
 build() {
   cmake -B build -S ownCloud-$pkgver \
         -DCMAKE_INSTALL_PREFIX=/usr

Added: fix-build-glib2.patch
===================================================================
--- fix-build-glib2.patch	                        (rev 0)
+++ fix-build-glib2.patch	2021-05-25 20:12:43 UTC (rev 946300)
@@ -0,0 +1,21 @@
+diff --git a/src/gui/libcloudproviders/libcloudproviders.cpp b/src/gui/libcloudproviders/libcloudproviders.cpp
+index 99409e813..9e41e30f0 100644
+--- a/src/gui/libcloudproviders/libcloudproviders.cpp
++++ b/src/gui/libcloudproviders/libcloudproviders.cpp
+@@ -12,12 +12,10 @@
+  * for more details.
+  */
+ 
+-extern "C" {
+-    #include <cloudproviders/cloudprovidersaccountexporter.h>
+-    #include <cloudproviders/cloudprovidersproviderexporter.h>
+-    #include <gio/gio.h>
+-    #include <glib.h>
+-}
++#include <cloudproviders/cloudprovidersaccountexporter.h>
++#include <cloudproviders/cloudprovidersproviderexporter.h>
++#include <gio/gio.h>
++#include <glib.h>
+ 
+ #include "libcloudproviders.h"
+ #include "libcloudproviders_p.h"

Added: fix-build-qt.patch
===================================================================
--- fix-build-qt.patch	                        (rev 0)
+++ fix-build-qt.patch	2021-05-25 20:12:43 UTC (rev 946300)
@@ -0,0 +1,13 @@
+diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
+index 586035346..c5c7bbccf 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;