git » nextcloud-client.git » commit 60befad

upgpkg: 2:3.11.0-3: Rebuild with unified single package

author Caleb Maclennan
2023-12-25 10:43:27 UTC
committer Caleb Maclennan
2023-12-25 10:43:27 UTC
parent 5b5438a401aebd3cc67f90545d57520aeecadc42

upgpkg: 2:3.11.0-3: Rebuild with unified single package

.SRCINFO +17 -24
PKGBUILD +6 -2

diff --git a/.SRCINFO b/.SRCINFO
index 41c8814..fff2b26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,19 @@
 pkgbase = nextcloud-client
+	pkgdesc = Nextcloud desktop client
 	pkgver = 3.11.0
-	pkgrel = 1
+	pkgrel = 3
 	epoch = 2
 	url = https://nextcloud.com/
 	arch = x86_64
-	license = GPL
+	license = GPL-2.0-or-later
 	makedepends = cmocka
 	makedepends = doxygen
 	makedepends = extra-cmake-modules
 	makedepends = git
 	makedepends = kio5
-	makedepends = libcloudproviders
 	makedepends = librsvg
-	makedepends = openssl
 	makedepends = python-sphinx
-	makedepends = qt5-quickcontrols2
-	makedepends = qt5-svg
 	makedepends = qt5-tools
-	makedepends = qt5-webengine
-	makedepends = qt5-websockets
-	makedepends = qtkeychain-qt5
-	makedepends = sqlite
-	source = nextcloud-client::git+https://github.com/nextcloud/desktop.git?signed#tag=32fd0f49baafc21eee3dfc6b36cfdf623b244727
-	validpgpkeys = A26B951528EA1BA1678C7AE5D406C75CEE1A36D6
-	validpgpkeys = 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28
-	validpgpkeys = 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2
-	validpgpkeys = 0739B11EDA696A3616666F6AE04221E85C5BB816
-	validpgpkeys = 267BF70F7905C2723B0243267D0F74F05C22F553
-	validpgpkeys = 3A877D9A896A057948059DEDAD2C27357B2CB11D
-	sha256sums = SKIP
-
-pkgname = nextcloud-client
-	pkgdesc = Nextcloud desktop client
 	depends = hicolor-icon-theme
 	depends = karchive5
 	depends = libcloudproviders
@@ -50,8 +32,19 @@ pkgname = nextcloud-client
 	optdepends = python-nautilus: integration with Nautilus
 	optdepends = python-caja: integration with Caja
 	optdepends = nextcloud-client-cloudproviders: cloudproviders support
+	provides = nextcloud-client-cloudproviders
+	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=32fd0f49baafc21eee3dfc6b36cfdf623b244727
+	source = 0001-Avoid_duplicate_declarations_with_latest_libcloudproviders.patch::https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/6275.patch
+	validpgpkeys = A26B951528EA1BA1678C7AE5D406C75CEE1A36D6
+	validpgpkeys = 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28
+	validpgpkeys = 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2
+	validpgpkeys = 0739B11EDA696A3616666F6AE04221E85C5BB816
+	validpgpkeys = 267BF70F7905C2723B0243267D0F74F05C22F553
+	validpgpkeys = 3A877D9A896A057948059DEDAD2C27357B2CB11D
+	sha256sums = SKIP
+	sha256sums = 681d70c75a01498f6c1c21c6b0d29e1a92515fd6570a47e775590285e9e0a03a
 
-pkgname = nextcloud-client-cloudproviders
-	pkgdesc = cloudproviders support for the Nextcloud desktop client
-	depends = nextcloud-client
+pkgname = nextcloud-client
diff --git a/PKGBUILD b/PKGBUILD
index 909150e..6e56b48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,26 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Maintainer: Chih-Hsuan Yen <yan12125@archlinux.org>
+# Contributor: Fabian Bornschein <fabiscafe@mailbox.org>
 # Contributor: Tyler Dence <tyzoid@archlinux32.org>
 # Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
 
-# Upstream does not provide signed tarballs (yet)
+# Upstream does not provide signed tarballs (yet), see:
 # https://github.com/nextcloud/desktop/issues/1510
 #
 # Updates to signed Git tags requires refreshing repo once first before
 # 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.
 
 pkgname=nextcloud-client
 pkgdesc='Nextcloud desktop client'
 epoch=2
 pkgver=3.11.0
 _tag=32fd0f49baafc21eee3dfc6b36cfdf623b244727
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://nextcloud.com/'
 _url=https://github.com/nextcloud/desktop