From b7238d90c42c47603c31f124fba6bd46e5520618 Mon Sep 17 00:00:00 2001 From: Carlos Galindo Date: Mon, 8 Apr 2024 16:08:48 +0200 Subject: [PATCH 1/3] update to 9.1.0 --- .SRCINFO | 9 ++++++--- PKGBUILD | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 955daf9..6795eaa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,17 @@ pkgbase = nextcloud-app-onlyoffice pkgdesc = ONLYOFFICE connector allows you to view, edit and collaborate using ONLYOFFICE Docs. - pkgver = 9.0.0 + pkgver = 9.1.0 pkgrel = 1 url = https://github.com/ONLYOFFICE/onlyoffice-nextcloud arch = any + groups = nextcloud-apps license = AGPL3 makedepends = yq - source = onlyoffice-nextcloud-9.0.0.tar.gz::https://github.com/ONLYOFFICE/onlyoffice-nextcloud/archive/v9.0.0.tar.gz + source = onlyoffice-nextcloud-9.1.0.tar.gz::https://github.com/ONLYOFFICE/onlyoffice-nextcloud/archive/v9.1.0.tar.gz + source = onlyoffice-document-formats-master.tar.gz::https://github.com/ONLYOFFICE/document-formats/archive/master.tar.gz source = onlyoffice-document-templates-main-new.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/main/new.tar.gz - sha512sums = 3eb18f83a8599267e13a9c5b14ec678c3ce64fecf15689e04e7ab454569f862d6b9cda1f3e997ce3bd938dc3af7434850e5f2a01c4ba0b66677c38e99fd0a1da + sha512sums = 1d426e1bfab6464e1be6873e60aa131fa0dacd62b895e597ccb96c2315da6abcac28d2b428c0a4ec15e7c5791cf65104bb59a2268e76f78712e488d42c0e352c + sha512sums = 93d066eb67955e4262c341ca919c7973974a16bba9b0c2fe5687b7a0ae52ec625dbfc89cbed6c32fd6c2db2c8a8899d065b9ffba0d572fe714130f73c13312cd sha512sums = 0d4239ea9d9f7848afe4eb192b67bfae5e56e7614d38eb6970cf6a54651f1a32c5e30d229e2c63b98530fc98e87f0e395d051234f33514109dc17bf1ca694b11 pkgname = nextcloud-app-onlyoffice diff --git a/PKGBUILD b/PKGBUILD index 62eb67a..b62d28f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,19 @@ # Maintainer: Carlos Galindo < arch -at - cgj.es > _appname=onlyoffice pkgname=nextcloud-app-onlyoffice -pkgver=9.0.0 +pkgver=9.1.0 pkgrel=1 pkgdesc="ONLYOFFICE connector allows you to view, edit and collaborate using ONLYOFFICE Docs." arch=("any") url="https://github.com/ONLYOFFICE/onlyoffice-nextcloud" license=('AGPL3') makedepends=('yq') +groups=('nextcloud-apps') source=("$_appname-nextcloud-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" + "onlyoffice-document-formats-master.tar.gz::https://github.com/ONLYOFFICE/document-formats/archive/master.tar.gz" "onlyoffice-document-templates-main-new.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/main/new.tar.gz") -sha512sums=('3eb18f83a8599267e13a9c5b14ec678c3ce64fecf15689e04e7ab454569f862d6b9cda1f3e997ce3bd938dc3af7434850e5f2a01c4ba0b66677c38e99fd0a1da' +sha512sums=('1d426e1bfab6464e1be6873e60aa131fa0dacd62b895e597ccb96c2315da6abcac28d2b428c0a4ec15e7c5791cf65104bb59a2268e76f78712e488d42c0e352c' + '93d066eb67955e4262c341ca919c7973974a16bba9b0c2fe5687b7a0ae52ec625dbfc89cbed6c32fd6c2db2c8a8899d065b9ffba0d572fe714130f73c13312cd' '0d4239ea9d9f7848afe4eb192b67bfae5e56e7614d38eb6970cf6a54651f1a32c5e30d229e2c63b98530fc98e87f0e395d051234f33514109dc17bf1ca694b11') _get_nextcloud_versions() { @@ -28,6 +31,6 @@ package() { local _appsdir="$pkgdir/usr/share/webapps/nextcloud/apps" mkdir -p "$_appsdir" cp -a "$_appname-nextcloud-$pkgver" "$_appsdir/$_appname" - rmdir "$_appsdir/$_appname/assets" - cp -a document-templates-main-new "$_appsdir/$_appname/assets" + cp -a document-templates-main-new/* "$_appsdir/$_appname/assets/document-templates" + cp -a document-formats-master/* "$_appsdir/$_appname/assets/document-formats" } From 538f2c985084f915ce74c4f8c0d2e0cc8a3068a5 Mon Sep 17 00:00:00 2001 From: Carlos Galindo Date: Wed, 22 May 2024 15:05:07 +0200 Subject: [PATCH 2/3] update build scripts --- PKGBUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index b62d28f..4ac0af2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="ONLYOFFICE connector allows you to view, edit and collaborate using ONL arch=("any") url="https://github.com/ONLYOFFICE/onlyoffice-nextcloud" license=('AGPL3') -makedepends=('yq') +makedepends=('yq' 'npm') groups=('nextcloud-apps') source=("$_appname-nextcloud-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" "onlyoffice-document-formats-master.tar.gz::https://github.com/ONLYOFFICE/document-formats/archive/master.tar.gz" @@ -22,6 +22,12 @@ _get_nextcloud_versions() { _app_max_major_version=$(expr ${_app_max_major_version} + 1) } +build() { + cd $_appname-nextcloud-$pkgver + npm install + npm run build +} + package() { local _app_min_major_version local _app_max_major_version @@ -31,6 +37,7 @@ package() { local _appsdir="$pkgdir/usr/share/webapps/nextcloud/apps" mkdir -p "$_appsdir" cp -a "$_appname-nextcloud-$pkgver" "$_appsdir/$_appname" + rm -rf "$_appsdir/$_appname/{.github,.git,.gitmodules,node_modules,src,package.json,package-lock.json,webpack.js,ruleset.xml}" cp -a document-templates-main-new/* "$_appsdir/$_appname/assets/document-templates" cp -a document-formats-master/* "$_appsdir/$_appname/assets/document-formats" } From c45dc0f56851b9a4cfec29785692a48719887e8a Mon Sep 17 00:00:00 2001 From: Carlos Galindo Date: Wed, 22 May 2024 15:09:28 +0200 Subject: [PATCH 3/3] update to 9.2.0 --- .SRCINFO | 7 ++++--- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6795eaa..19ebaae 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,17 @@ pkgbase = nextcloud-app-onlyoffice pkgdesc = ONLYOFFICE connector allows you to view, edit and collaborate using ONLYOFFICE Docs. - pkgver = 9.1.0 + pkgver = 9.2.0 pkgrel = 1 url = https://github.com/ONLYOFFICE/onlyoffice-nextcloud arch = any groups = nextcloud-apps license = AGPL3 makedepends = yq - source = onlyoffice-nextcloud-9.1.0.tar.gz::https://github.com/ONLYOFFICE/onlyoffice-nextcloud/archive/v9.1.0.tar.gz + makedepends = npm + source = onlyoffice-nextcloud-9.2.0.tar.gz::https://github.com/ONLYOFFICE/onlyoffice-nextcloud/archive/v9.2.0.tar.gz source = onlyoffice-document-formats-master.tar.gz::https://github.com/ONLYOFFICE/document-formats/archive/master.tar.gz source = onlyoffice-document-templates-main-new.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/main/new.tar.gz - sha512sums = 1d426e1bfab6464e1be6873e60aa131fa0dacd62b895e597ccb96c2315da6abcac28d2b428c0a4ec15e7c5791cf65104bb59a2268e76f78712e488d42c0e352c + sha512sums = e78dc1d8e7fe9ed854e3e862c00bedca94f2f90aeca129888a49fa34d8a970a462f845b7084a75c997d89af7a326703032e3ebe76aa0d0ebaf07735236744355 sha512sums = 93d066eb67955e4262c341ca919c7973974a16bba9b0c2fe5687b7a0ae52ec625dbfc89cbed6c32fd6c2db2c8a8899d065b9ffba0d572fe714130f73c13312cd sha512sums = 0d4239ea9d9f7848afe4eb192b67bfae5e56e7614d38eb6970cf6a54651f1a32c5e30d229e2c63b98530fc98e87f0e395d051234f33514109dc17bf1ca694b11 diff --git a/PKGBUILD b/PKGBUILD index 4ac0af2..83c77f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Carlos Galindo < arch -at - cgj.es > _appname=onlyoffice pkgname=nextcloud-app-onlyoffice -pkgver=9.1.0 +pkgver=9.2.0 pkgrel=1 pkgdesc="ONLYOFFICE connector allows you to view, edit and collaborate using ONLYOFFICE Docs." arch=("any") @@ -12,7 +12,7 @@ groups=('nextcloud-apps') source=("$_appname-nextcloud-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" "onlyoffice-document-formats-master.tar.gz::https://github.com/ONLYOFFICE/document-formats/archive/master.tar.gz" "onlyoffice-document-templates-main-new.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/main/new.tar.gz") -sha512sums=('1d426e1bfab6464e1be6873e60aa131fa0dacd62b895e597ccb96c2315da6abcac28d2b428c0a4ec15e7c5791cf65104bb59a2268e76f78712e488d42c0e352c' +sha512sums=('e78dc1d8e7fe9ed854e3e862c00bedca94f2f90aeca129888a49fa34d8a970a462f845b7084a75c997d89af7a326703032e3ebe76aa0d0ebaf07735236744355' '93d066eb67955e4262c341ca919c7973974a16bba9b0c2fe5687b7a0ae52ec625dbfc89cbed6c32fd6c2db2c8a8899d065b9ffba0d572fe714130f73c13312cd' '0d4239ea9d9f7848afe4eb192b67bfae5e56e7614d38eb6970cf6a54651f1a32c5e30d229e2c63b98530fc98e87f0e395d051234f33514109dc17bf1ca694b11')