git » nextcloud-client.git » commit 960d3de

Revert "upgpkg: 2:3.9.0-2; drop patch disabling bulk uploads, rumored to be fixed in 3.9.0"

author Caleb Maclennan
2023-08-22 01:44:53 UTC
committer Caleb Maclennan
2023-08-22 01:45:33 UTC
parent 72fa6878c11ba37b579082372548d444baf33988
Revert "upgpkg: 2:3.9.0-2; drop patch disabling bulk uploads, rumored to be fixed in 3.9.0"

This reverts commit cf258d5e1d5fec284c45ba2928022526009899f4.

Not fixed in server yet, updated open issue number in patch...
PKGBUILD +7 -1 
diff --git a/PKGBUILD b/PKGBUILD
index 6c22b73..b0d6ac9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ epoch=2
 # https://github.com/nextcloud/desktop/issues/1510
 pkgver=3.9.3
 _tag=5e4c6ae5e3774466e00c1b2358b7b92f77211cf4
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://nextcloud.com/'
 _url=https://github.com/nextcloud/desktop
@@ -59,6 +59,12 @@ prepare() {
   # tmpdir for check()
   mkdir -p tmpdir
   cd $pkgbase
+  # Monkey patch that disables bulk upload capability which causes infinite
+  # loops for many server/client combos. Feature is also disabled by default on
+  # server end in v23.0.3 because it was so problematic. This can abe re-enabled
+  # when underlying bug squashed:
+  # https://github.com/nextcloud/desktop/issues/5726
+  sed -i -e '/bulkupload/s/return _.*;$/return false;/' src/libsync/capabilities.cpp
   # Disable tests that touch on disabled feature
   sed -i -e '/SyncEngine/s/^/#/' -e '/Capabilities/s/^/#/' -e '/SecureFileDrop/s/^/#/' test/CMakeLists.txt
 }