git » nextcloud-client.git » commit 8eb5185

diff --git a/.SRCINFO b/.SRCINFO
index 1e3324b..3f593b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nextcloud-client
 	pkgdesc = Nextcloud desktop client
 	pkgver = 3.12.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://nextcloud.com/
 	arch = x86_64
@@ -36,15 +36,13 @@ pkgbase = nextcloud-client
 	conflicts = nextcloud-client-cloudproviders
 	replaces = nextcloud-client-cloudproviders
 	backup = etc/Nextcloud/sync-exclude.lst
-	source = nextcloud-client::git+https://github.com/nextcloud/desktop.git?signed#tag=b4315f5b8bcdf94d6ac2d841a7ef3113cced79de
-	source = 0001-Avoid_duplicate_declarations_with_latest_libcloudproviders.patch::https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/6275.patch
+	source = nextcloud-client::git+https://github.com/nextcloud/desktop.git?signed#tag=v3.12.1
 	validpgpkeys = A26B951528EA1BA1678C7AE5D406C75CEE1A36D6
 	validpgpkeys = 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28
 	validpgpkeys = 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2
 	validpgpkeys = 0739B11EDA696A3616666F6AE04221E85C5BB816
 	validpgpkeys = 267BF70F7905C2723B0243267D0F74F05C22F553
 	validpgpkeys = 3A877D9A896A057948059DEDAD2C27357B2CB11D
-	sha256sums = SKIP
-	sha256sums = 681d70c75a01498f6c1c21c6b0d29e1a92515fd6570a47e775590285e9e0a03a
+	sha256sums = bde58e18fc6ea8c7e2a12d2b992c42c13250a97d7d1dc218f1c9970a5eebfc23
 
 pkgname = nextcloud-client
diff --git a/PKGBUILD b/PKGBUILD
index 006343d..063a3cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,17 +11,12 @@
 # integrity checks will work:
 #
 #     makepkg -o --nodeps --skippgpcheck
-#
-# Also note that $_tag must be the SHA of the tag, not the tagged commit.
-# The _pkgver function should help get that right:
-# Bump the pkgver field, then `bash -c 'source PKGBUILD; _pkgver'`
 
 pkgname=nextcloud-client
 pkgdesc='Nextcloud desktop client'
 epoch=2
 pkgver=3.12.1
-_tag=b4315f5b8bcdf94d6ac2d841a7ef3113cced79de
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://nextcloud.com/'
 _url=https://github.com/nextcloud/desktop
@@ -56,28 +51,14 @@ makedepends=(cmocka
              librsvg
              python-sphinx
              qt5-tools)
-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
-  17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2 # https://github.com/er-vin
-  0739B11EDA696A3616666F6AE04221E85C5BB816 # https://github.com/allexzander
-  267BF70F7905C2723B0243267D0F74F05C22F553 # https://github.com/mgallien
-  3A877D9A896A057948059DEDAD2C27357B2CB11D # https://github.com/FlexW
-)
-sha256sums=('SKIP'
-            '681d70c75a01498f6c1c21c6b0d29e1a92515fd6570a47e775590285e9e0a03a')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-_pkgver() {
-  curl -fs https://api.github.com/repos/nextcloud/desktop/git/ref/tags/v$pkgver |
-    jq -r .object.sha
-}
+source=("$pkgname::git+$_url.git?signed#tag=v$pkgver")
+validpgpkeys=(A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # https://github.com/camilasan
+              42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28  # https://github.com/misch7
+              17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2  # https://github.com/er-vin
+              0739B11EDA696A3616666F6AE04221E85C5BB816  # https://github.com/allexzander
+              267BF70F7905C2723B0243267D0F74F05C22F553  # https://github.com/mgallien
+              3A877D9A896A057948059DEDAD2C27357B2CB11D) # https://github.com/FlexW
+sha256sums=('bde58e18fc6ea8c7e2a12d2b992c42c13250a97d7d1dc218f1c9970a5eebfc23')
 
 prepare() {
   # tmpdir for check()
@@ -91,13 +72,10 @@ 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() {
   cd $pkgname
-
   # bundled breakpad in libcrashreporter-qt submodule is too old and does not build with glibc >= 2.26
   # Upstream fix: https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d
   cmake -B build -S . \
@@ -107,7 +85,6 @@ build() {
     -DBUILD_UPDATER=OFF \
     -DUNIT_TESTING=ON \
     -DPLUGINDIR=lib/qt/plugins # Fix vfs plugin install dir https://github.com/nextcloud/desktop/issues/3781#issuecomment-918918320
-
   # TODO: fix installation of PDF and HTML documents
   # WIP at https://github.com/yan12125/desktop/tree/doc-install-path
   make -C build all doc-man
@@ -115,7 +92,6 @@ build() {
 
 check() {
   cd $pkgname/build
-
   # Tests fail if $TMPDIR is too small; specify an alternative for machines
   # with a small /tmp partition.
   # Use UTC as TestCookies is sensitive to the timezone
@@ -125,7 +101,6 @@ check() {
 
 package() {
   cd $pkgname/build
-
   make DESTDIR="$pkgdir" install
 }