upstream v3.0.0-6

2 files changed, 44 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09c1669c9904..db964681657c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,26 @@
 pkgbase = collabora-online-server-nodocker
 	pkgdesc = Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker
 	pkgver = 3.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
 	license = MPL
 	depends = cpio
+	depends = noto-fonts
 	depends = gcc-libs
 	depends = libcap
+	depends = pam
 	depends = libpng12
 	depends = poco178
 	depends = openssl-1.0
 	depends = zlib
 	depends = fontconfig
 	depends = libsm
-	depends = unixodbc
 	depends = libxinerama
-	depends = cairo
 	depends = mesa-libgl
 	depends = libcups
-	depends = dbus-glib
+	depends = libxcb
 	optdepends = hunspell-de: German hunspell dictionaries for LibreOffice
 	optdepends = hunspell-en: English (US, UK, etc.) hunspell dictionaries for LibreOffice
 	optdepends = hunspell-en_AU: AU English hunspell dictionaries for LibreOffice
@@ -56,23 +56,23 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.0.0-4_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.36-36_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.0.0-6_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.38-38_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.38-38_amd64.deb
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_3.0-2_all.deb
 	sha1sums = SKIP
 	sha1sums = 3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8
@@ -80,23 +80,23 @@ pkgbase = collabora-online-server-nodocker
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = b06d48fad289ba47de26a223f84140d4e207a7e2
-	sha1sums = cb8d78bfac9fed012b91c023bd44d34db2c425c7
-	sha1sums = 5da843f577abaf3f021bdbcd325672c94c484711
-	sha1sums = 91aa5f175d9bf1eaa3ab2f76193fb882360e441d
-	sha1sums = 4a234078ccea11d538f290f479c34c734092bd2c
-	sha1sums = 4ee5a4f39fdeb95b5880abc479803f8086519f4b
-	sha1sums = acf31c15e2cd66511c244806b4e12ab1b5bc99fc
-	sha1sums = 2cdb9377188fa2985dfa0594728a27b0cdd25030
-	sha1sums = c0edb3374f8a9bdd23a1c8def710355ddfa18f40
-	sha1sums = 6272afc75a653744c1c4ec840e0d6a8f5a575963
-	sha1sums = 60715b85f4bb3617852c76d6e273d6cd1ccc95a8
-	sha1sums = 9bc1ad900014a975023c9b090202d9549d14891f
-	sha1sums = c7d3f59f2b935ffd5f08b660dc14c21af13f304a
-	sha1sums = 2808f9acf8c910975294c066370d710cb86bebb3
-	sha1sums = 7c23679da454e44e35b8ebaa869c02749c8fca1e
-	sha1sums = ebe293244eabb16e8ecbf010042edbfd5de00b0c
-	sha1sums = 7f9829685514fb4fc4cb47eb6bee79944f446f61
+	sha1sums = b48f9c880c5ddf70ce278f37a8752bc4d390810c
+	sha1sums = f18ea97e5b4fa91957e1a965bbd860995c3f8211
+	sha1sums = c0fe4e6483b6124f2320edbffff6869290ed8e64
+	sha1sums = cfc6c88c781c790505e249f200d3efb8ff49c05f
+	sha1sums = 8c2c8968b980d56f11f68444fbf19dbfcf147028
+	sha1sums = 02a192289be3f5452fc83161c06060255b62b851
+	sha1sums = 8387af964093a7b9c7681af78f6857933e203a9a
+	sha1sums = 1f19af2dc3608ad7f6e0a49e362bcf17e4d1986f
+	sha1sums = 4d60f01fdf266624054a211172b357ab37f80d26
+	sha1sums = 752ccd2c5aad8ba533a7d949da4b139687f4c9a5
+	sha1sums = 5a7d063704996bdc1884e013241cb28509413622
+	sha1sums = 6359348f84dd421bb0c1c3f2d94e33e5aab68b47
+	sha1sums = 4de9f7e64fefa034c5c789bffaf159ed35052d44
+	sha1sums = b6e38e5566b854cc0f8b37e6bfccac92d4830111
+	sha1sums = 5e08d12fdae835efe125c5fa00ea3ba3db6e0f46
+	sha1sums = a471fc8d3e98ed0b08f9e743ce90b719e105105d
+	sha1sums = ca94aee142780d86f91edaeea699a6d79766e6f0
 	sha1sums = 1e4b0c8226ad560bcc90910e80154f0507b66304
 
 pkgname = collabora-online-server-nodocker
diff --git a/PKGBUILD b/PKGBUILD
index b584c4c65593..e1ce307dfe6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=collabora-online-server-nodocker
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
 url="https://www.collaboraoffice.com/code/"
@@ -35,7 +35,7 @@ optdepends=(
   'hyphen-hu: Hungarian hyphenation rules for LibreOffice'
   'hyphen-pl: Polish hyphenation rules for LibreOffice'
 )
-depends=(cpio)
+depends=(cpio noto-fonts)
 source=(
   'https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages'
   install
@@ -63,21 +63,19 @@ backup=(
 # From Debian’s pre/post scripts
 install=install
 
-_upstream_deps='loolwsd code-brand'
+_upstream_deps='loolwsd code-brand collaboraofficebasis5.3-calc collaboraofficebasis5.3-core collaboraofficebasis5.3-extension-pdf-import collaboraofficebasis5.3-filter-data collaboraofficebasis5.3-graphicfilter collaboraofficebasis5.3-images collaboraofficebasis5.3-impress collaboraofficebasis5.3-ooofonts collaboraofficebasis5.3-writer'
 _upstream_equiv='
   adduser             = 
   cpio                = 
   fontconfig          = fontconfig
   init-system-helpers = 
   libc6               = gcc-libs
-  libcairo2           = cairo
   libcap2             = libcap
   libcap2-bin         = libcap
   libcups2            = libcups
-  libdbus-glib-1-2    = dbus-glib
   libgcc1             = gcc-libs
   libgl1-mesa-glx     = mesa-libgl
-  libodbc1            = unixodbc
+  libpam0g            = pam
   libpng12-0          = libpng12
   libpococrypto48     = poco178
   libpocofoundation48 = poco178
@@ -89,6 +87,8 @@ _upstream_equiv='
   libsm6              = libsm
   libssl1.0.0         = openssl-1.0
   libstdc++6          = gcc-libs
+  libxcb-render0      = libxcb
+  libxcb-shm0         = libxcb
   libxinerama1        = libxinerama
   zlib1g              = zlib
 '