git » nextcloud-client.git » commit 16881c2

* All patches are merged upstream, yay! [1][2]

author Chih-Hsuan Yen
2019-03-20 10:54:14 UTC
committer Chih-Hsuan Yen
2019-03-20 10:54:14 UTC
parent 201a0544c10ece83e72e77052a18ede1803bd124
* All patches are merged upstream, yay! [1][2]


[1] https://github.com/nextcloud/desktop/pull/946
[2] https://github.com/nextcloud/desktop/pull/959

* qtwebengine is not really necessary. Here are IRC logs on
  freenode.net#nextcloud-client, starting from 2019/1/1 21:23:38 UTC+8:

[21:23:38] <yan12125> Hi, maintainer of Arch Linux package nextcloud-client here.
[21:23:41] <yan12125> https://github.com/nextcloud/desktop/wiki/How-to-compile-the-desktop-client
[21:24:18] <yan12125> On this page -DNO_SHIBBOLETH=1 is used to configure the desktop client. Is it the suggested configuration?
[01:42:25] <camilasan> Yes, unless you do use shibboleth...
[01:42:40] <camilasan> yan12125 ^
[10:38:24] <yan12125> Thanks camilasan! Sounds like it's still a working feature, just that few people use that?
[15:53:49] <rullzer> yan12125: well not really as qwebkit is not really supported anymore. But shibboleth should now also work just fine with the new login flow :)
[19:25:46] <yan12125> rullzer: thank you very much for the information! I'll disable the feature in the next Arch package update.
[19:26:56] <yan12125> On Arch nextcloud-client depends on both qtwebkit and qtwebengine, which confuses some users, and it's a great news that it works with only qtwebengine.
[19:32:21] <rullzer> yan12125: yeah should work. And then only qtwebengine is needed ;)
PKGBUILD +6 -15 
diff --git a/PKGBUILD b/PKGBUILD
index e353c28..6030e8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
 
 pkgname=nextcloud-client
-pkgver=2.5.1
-pkgrel=2
+pkgver=2.5.2
+pkgrel=1
 pkgdesc='Nextcloud desktop client'
 arch=(x86_64)
 url='https://nextcloud.com/'
 license=(GPL)
-depends=(sqlite qtkeychain qt5-svg qt5-webengine qt5-webkit xdg-utils)
+depends=(openssl sqlite qtkeychain qt5-svg qt5-webengine xdg-utils)
 makedepends=(doxygen extra-cmake-modules kio python-sphinx qt5-tools)
 optdepends=(
   'kio: integration with Dolphin'
@@ -17,23 +17,13 @@ optdepends=(
   'python-nautilus: integration with Nautilus'
   'python2-caja: integration with Caja'
 )
-source=("$pkgname-$pkgver.tar.gz"::"https://github.com/nextcloud/desktop/archive/v$pkgver.tar.gz"
-        fix-build-with-qt5.12.patch::https://github.com/nextcloud/desktop/commit/129588442041c32b0d98f2361a69e0e350592f70.patch
-        fix-login-crash.patch::https://github.com/yan12125/desktop/commit/09b0055dc3fe8ffae64dae7af9f522ed12ebdea8.patch)
-sha256sums=('48be2556f4fddb956ad31e954be5f9c73482e936a80ec0efaeb30549dcd81f19'
-            '69182f7f75428420385cde58a9e038c6c326105c3bccbe55f9a7bb1814e3f3fd'
-            '3443f76b1480bb66b71bd94284ae91f8d689e525e55a399b878bf48ad80b5beb')
+source=("$pkgname-$pkgver.tar.gz"::"https://github.com/nextcloud/desktop/archive/v$pkgver.tar.gz")
+sha256sums=('127bee0733ef977a2a8cfd874c686c4731e1feadec287b34ef7d73b1c271fafd')
 backup=('etc/Nextcloud/sync-exclude.lst')
 
 prepare() {
   cd desktop-$pkgver
 
-  patch -Np1 -i ../fix-build-with-qt5.12.patch
-
-  # https://github.com/nextcloud/desktop/issues/941
-  # https://bugs.archlinux.org/task/61106
-  patch -Np1 -i ../fix-login-crash.patch
-
   mkdir -p build
 }
 
@@ -43,6 +33,7 @@ build() {
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
+    -DNO_SHIBBOLETH=1 \
     ..
 
   make