git » nextcloud-client.git » commit c17e5d9

Add patch to avoid duplication of providers

author Fabian Bornschein
2023-12-24 23:56:25 UTC
committer Fabian Bornschein
2023-12-24 23:56:25 UTC
parent 60519d21038c9deb8d90d42e20263e29de2850bf

Add patch to avoid duplication of providers

* Upstream: https://github.com/nextcloud/desktop/pull/6275

PKGBUILD +6 -2

diff --git a/PKGBUILD b/PKGBUILD
index 9933a72..e4d326d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,8 @@ makedepends=(cmocka
              librsvg
              python-sphinx
              qt5-tools)
-source=("$pkgname::git+$_url.git?signed#tag=$_tag")
+source=("$pkgname::git+$_url.git?signed#tag=$_tag"
+        "0001-Avoid_duplicate_declarations_with_latest_libcloudproviders.patch::https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/6275.patch")
 validpgpkeys=(
   A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # https://github.com/camilasan
   42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28 # https://github.com/misch7
@@ -60,7 +61,8 @@ validpgpkeys=(
   267BF70F7905C2723B0243267D0F74F05C22F553 # https://github.com/mgallien
   3A877D9A896A057948059DEDAD2C27357B2CB11D # https://github.com/FlexW
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '681d70c75a01498f6c1c21c6b0d29e1a92515fd6570a47e775590285e9e0a03a')
 
 pkgver() {
   cd $pkgname
@@ -84,6 +86,8 @@ prepare() {
   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
+  # Avoid duplicate declarations with latest libcloudproviders
+  git apply -3 ../0001-Avoid_duplicate_declarations_with_latest_libcloudproviders.patch
 }
 
 build() {