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

[Antonio Rojas]

    Date: Friday, June 12, 2020 @ 19:37:00
  Author: arojas
Revision: 642560

Update to 2.6.3

Added:
  owncloud-client/trunk/owncloud-client-qt-5.15.patch
Modified:
  owncloud-client/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   21 ++++++++++-----------
 owncloud-client-qt-5.15.patch |   12 ++++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-12 19:28:30 UTC (rev 642559)
+++ PKGBUILD	2020-06-12 19:37:00 UTC (rev 642560)
@@ -3,7 +3,7 @@
 
 _name=owncloudclient
 pkgname=owncloud-client
-pkgver=2.6.1.13407
+pkgver=2.6.3.14058
 pkgrel=1
 pkgdesc='ownCloud client based on mirall'
 arch=(x86_64)
@@ -13,26 +13,25 @@
 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/stable/owncloudclient-$pkgver.tar.xz{,.asc})
-sha256sums=('d8a7381e5f17d255342a3bace52d906c08bb1e76e07a89eeb14e3fda8bad41ca'
-            'SKIP')
+source=(https://download.owncloud.com/desktop/stable/owncloudclient-$pkgver.tar.xz{,.asc}
+        owncloud-client-qt-5.15.patch)
+sha256sums=('e3d38de31e041f0e1836b2b74acfc1fc76eea4955968952a65643cbf36a493f5'
+            'SKIP'
+            '33f2c09bd174f2fe4db74766db3a8028e96502f912b7d41be05ce211bfe1eaca')
 validpgpkeys=(F05F7DD7953A07DF36579DAA498C45EBE94E7B37) # ownCloud Client Team (Signing Key) <info at owncloud.com>
 
 prepare() {
-  mkdir -p build
+  patch -d $_name-$pkgver -p1 -i ../owncloud-client-qt-5.15.patch # Fix build with Qt 5.15
 }
 
 build() {
-  cd build
-
-  cmake ../$_name-$pkgver \
+  cmake -B build -S $_name-$pkgver \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_SYSCONFDIR=/etc/$pkgname
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }

Added: owncloud-client-qt-5.15.patch
===================================================================
--- owncloud-client-qt-5.15.patch	                        (rev 0)
+++ owncloud-client-qt-5.15.patch	2020-06-12 19:37:00 UTC (rev 642560)
@@ -0,0 +1,12 @@
+diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
+index d1e877df1..d1d75bad3 100644
+--- a/src/libsync/networkjobs.cpp
++++ b/src/libsync/networkjobs.cpp
+@@ -31,6 +31,7 @@
+ #include <QJsonObject>
+ #ifndef TOKEN_AUTH_ONLY
+ #include <QPainter>
++#include <QPainterPath>
+ #endif
+ 
+ #include "networkjobs.h"