Date: Tuesday, November 5, 2019 @ 16:49:39 Author: yan12125 Revision: 524193
upgpkg: nextcloud-client 2.6.1-1 Added: nextcloud-client/trunk/nextcloud-client-fix-build.diff Modified: nextcloud-client/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 19 +++++++++++-------- nextcloud-client-fix-build.diff | 13 +++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-05 16:49:19 UTC (rev 524192) +++ PKGBUILD 2019-11-05 16:49:39 UTC (rev 524193) @@ -3,9 +3,9 @@ # Contributor: Konstantin Shalygin <k0...@k0ste.ru> pkgname=nextcloud-client -pkgver=2.6.0 -_commit=e0b32c19e4dd641f4edf74fc3fbdba3d86ca9784 -pkgrel=4 +pkgver=2.6.1 +_commit=5adbc01ef138efd252c5c8c340f57dae0b34d8b9 +pkgrel=1 pkgdesc='Nextcloud desktop client' arch=(x86_64) url='https://nextcloud.com/' @@ -19,16 +19,16 @@ 'python-caja: integration with Caja' ) source=("$pkgname::git+https://github.com/nextcloud/desktop.git?signed#commit=$_commit"; - issue1458.patch::https://github.com/nextcloud/desktop/commit/481d8d3a0bcd26a3fd2b0d4fc6fb009260092bb1.patch issue1458-workaround.patch::https://github.com/yan12125/desktop/commit/7da680ef7843a52c3136916744f50d4a003bb8b5.patch - issue1458-2.patch::https://github.com/yan12125/desktop/commit/2b313368325dac5b8d0e69394cfcc4faaa745f75.patch) + issue1458-2.patch::https://github.com/yan12125/desktop/commit/2b313368325dac5b8d0e69394cfcc4faaa745f75.patch + $pkgname-fix-build.diff) validpgpkeys=( A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan ) sha256sums=('SKIP' - '8e3129fbbda282d5b0fbc1f3d495338c18fd19f639301647eb5f853b713c369c' '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3' - '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a') + '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a' + '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645') backup=('etc/Nextcloud/sync-exclude.lst') prepare() { @@ -40,9 +40,12 @@ rm -v $pkgname/cmake/modules/GNUInstallDirs.cmake cd $pkgname - patch -Np1 -i ../issue1458.patch patch -Np1 -i ../issue1458-workaround.patch patch -Np1 -i ../issue1458-2.patch + + # 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() { Added: nextcloud-client-fix-build.diff =================================================================== --- nextcloud-client-fix-build.diff (rev 0) +++ nextcloud-client-fix-build.diff 2019-11-05 16:49:39 UTC (rev 524193) @@ -0,0 +1,13 @@ +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 {
