author | Chih-Hsuan Yen
<yan12125@archlinux.org> 2020-08-18 16:15:07 UTC |
committer | Chih-Hsuan Yen
<yan12125@archlinux.org> 2020-08-18 16:15:07 UTC |
parent | 5ee5e9526a8b5606decb851e328179607b0ed50c |
Nextcloud.conf | +0 | -2 |
PKGBUILD | +11 | -24 |
nextcloud-client-fix-build.diff | +0 | -13 |
diff --git a/Nextcloud.conf b/Nextcloud.conf deleted file mode 100644 index 232a676..0000000 --- a/Nextcloud.conf +++ /dev/null @@ -1,2 +0,0 @@ -[General] -skipUpdateCheck=true diff --git a/PKGBUILD b/PKGBUILD index 8f2f628..f5a9662 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,14 +5,15 @@ pkgname=nextcloud-client # Upstream does not provide signed tarballs (yet) # https://github.com/nextcloud/desktop/issues/236#issuecomment-540538247 -pkgver=2.6.5 -_commit=adada8b2eecd65d7a587b6abe0ae2aabca9a0b75 -pkgrel=2 +pkgver=3.0.0 +_commit=ff175088a391007b66bfca89ef35cf29e37cf001 +pkgrel=1 pkgdesc='Nextcloud desktop client' arch=(x86_64) url='https://nextcloud.com/' license=(GPL) -depends=(openssl sqlite qtkeychain qt5-svg qt5-webengine xdg-utils libcloudproviders) +depends=(openssl sqlite qtkeychain qt5-svg qt5-webengine xdg-utils libcloudproviders + qt5-graphicaleffects qt5-quickcontrols2) makedepends=(doxygen extra-cmake-modules kio python-sphinx qt5-tools git cmocka) optdepends=( 'kio: integration with Dolphin' @@ -20,21 +21,16 @@ optdepends=( 'python-nautilus: integration with Nautilus' 'python-caja: integration with Caja' ) -# Remove ?signed temporarily as the tagged commit is signed by nextcloud-bot, -# whose GPG public key is missing. See https://github.com/nextcloud/desktop/issues/2185 -source=("$pkgname::git+https://github.com/nextcloud/desktop.git#commit=$_commit" - $pkgname-fix-build.diff - Nextcloud.conf) +# Not using ?signed here as only the tag is properly signed, not the commit. +# See https://github.com/nextcloud/desktop/issues/2185 +source=("$pkgname::git+https://github.com/nextcloud/desktop.git#commit=$_commit") validpgpkeys=( A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28 # controlled by github.com/misch7 - # 8B5274AEE6EC9C06B0DDAA96130DAB86D3FB356C # github.com/nextcloud-bot, public key missing + 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2 # https://github.com/er-vin.gpg ) -sha256sums=('SKIP' - '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645' - '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7') -backup=('etc/Nextcloud/sync-exclude.lst' - 'etc/Nextcloud/Nextcloud.conf') +sha256sums=('SKIP') +backup=('etc/Nextcloud/sync-exclude.lst') prepare() { # tmpdir for check() @@ -43,12 +39,6 @@ prepare() { # Use system GNUInstallDirs.cmake so that we can benefit from # https://gitlab.kitware.com/cmake/cmake/merge_requests/3735 rm -v $pkgname/cmake/modules/GNUInstallDirs.cmake - - cd $pkgname - - # https://github.com/nextcloud/desktop/pull/719 - # "Rename owncloud tests to nextcloud" - actually breaks building of tests - patch -Np1 -i ../$pkgname-fix-build.diff } build() { @@ -80,7 +70,4 @@ package() { cd $pkgname/build make DESTDIR="$pkgdir" install - - # Disables built-in update checker - install -Dm644 "$srcdir/Nextcloud.conf" -t "$pkgdir"/etc/Nextcloud } diff --git a/nextcloud-client-fix-build.diff b/nextcloud-client-fix-build.diff deleted file mode 100644 index 40e6f36..0000000 --- a/nextcloud-client-fix-build.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp -index 6ad1a6b37..dc2e476ad 100644 ---- a/test/testnextcloudpropagator.cpp -+++ b/test/testnextcloudpropagator.cpp -@@ -8,7 +8,7 @@ - #include <QDebug> - - #include "propagatedownload.h" --#include "nextcloudpropagator_p.h" -+#include "owncloudpropagator_p.h" - - using namespace OCC; - namespace OCC {