summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD49
-rwxr-xr-xrocketchat-desktop2
3 files changed, 33 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a47f7eceab3f..a74e657fc102 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rocketchat-desktop
pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
- pkgver = 3.2.4
+ pkgver = 3.4.0
pkgrel = 1
url = https://github.com/RocketChat/Rocket.Chat.Electron
install = rocketchat-desktop.install
@@ -11,14 +11,15 @@ pkgbase = rocketchat-desktop
makedepends = node-gyp
makedepends = python
makedepends = yarn
- depends = electron11
+ makedepends = asar
+ depends = electron
+ depends = nodejs
conflicts = rocketchat-client-bin
- source = https://github.com/RocketChat/Rocket.Chat.Electron/archive/3.2.4/rocketchat-desktop-3.2.4.tar.gz
+ source = rocketchat-desktop-3.4.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/3.4.0/rocketchat-desktop-3.4.0.tar.gz
source = rocketchat-desktop
source = rocketchat-desktop.desktop
- validpgpkeys = 9EA06BE6FD613A03
- sha256sums = 9a1f9c042f3b7d24e155ed8602d0880b47dcc5fbc30e247aa78921233afa99ad
- sha256sums = 57f2d0a2295ce4ed62a0461338d225f6c13e286ecb1ca418d722f8d4bdece6c4
+ sha256sums = fd77cf5a05e8866e9647fef8e793365148490bdc8c1c8986eb246b4540a4b728
+ sha256sums = 5fe8f552b4ac1917a1bb08e86f957e9b892220a2aab59b88e8256e2e092e1b1c
sha256sums = 31fae4f98a61a774f84030fd43d2ef92c7633740dc5aa55967a21d0e29ea621a
pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index eb0e70d08282..d550058ad71a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,47 +3,48 @@
# Contributor: sum01 <sum01@protonmail.com>
pkgname=rocketchat-desktop
-pkgver=3.2.4
-_pkgname="Rocket.Chat.Electron-${pkgver}"
+pkgver=3.4.0
pkgrel=1
pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
arch=('i686' 'x86_64')
url='https://github.com/RocketChat/Rocket.Chat.Electron'
license=('MIT')
-depends=('electron11')
-makedepends=('nodejs>=14.17.0' 'node-gyp' 'python' 'yarn')
+depends=('electron' 'nodejs')
+makedepends=('nodejs>=14.17.0' 'node-gyp' 'python' 'yarn' 'asar')
conflicts=('rocketchat-client-bin')
install=rocketchat-desktop.install
-source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
rocketchat-desktop
rocketchat-desktop.desktop)
-sha256sums=('9a1f9c042f3b7d24e155ed8602d0880b47dcc5fbc30e247aa78921233afa99ad'
- '57f2d0a2295ce4ed62a0461338d225f6c13e286ecb1ca418d722f8d4bdece6c4'
+sha256sums=('fd77cf5a05e8866e9647fef8e793365148490bdc8c1c8986eb246b4540a4b728'
+ '5fe8f552b4ac1917a1bb08e86f957e9b892220a2aab59b88e8256e2e092e1b1c'
'31fae4f98a61a774f84030fd43d2ef92c7633740dc5aa55967a21d0e29ea621a')
-validpgpkeys=('9EA06BE6FD613A03') # Tasso Evangelista
+# validpgpkeys=('9EA06BE6FD613A03') # Tasso Evangelista
prepare() {
- cd "$_pkgname"
- yarn upgrade electron@"$(</usr/lib/electron11/version)"
+ _ver="$(</usr/lib/electron/version)"
+ cd "Rocket.Chat.Electron-$pkgver"
+ yarn upgrade electron@"$_ver"
}
build() {
- cd "$_pkgname"
- local i686=ia32 x86_64=x64
- export NODE_ENV=production
- yarn build
- yarn run electron-builder --linux --"${!CARCH}" --dir \
- -c.electronDist=/usr/lib/electron11 \
- -c.electronVersion="$(</usr/lib/electron11/version)"
+ cd "Rocket.Chat.Electron-$pkgver"
+ local i686=ia32 x86_64=x64
+ export NODE_ENV=production
+ yarn build
+ yarn run electron-builder --linux --"${!CARCH}" --dir \
+ -c.electronDist=/usr/lib/electron \
+ -c.electronVersion="$_ver"
}
package() {
- local i686=linux-ia32-unpacked x86_64=linux-unpacked
- install -Dm644 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop"
- install -Dm755 -t "${pkgdir}/usr/bin" "$pkgname"
+ local i686=linux-ia32-unpacked x86_64=linux-unpacked
+ install -Dm644 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop"
+ install -Dm755 -t "${pkgdir}/usr/bin" "$pkgname"
- cd "$_pkgname"
- install -Dm644 "build/icons/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
- install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
- install -Dm644 "dist/${!CARCH}/resources/app.asar" "${pkgdir}/usr/lib/${pkgname}.asar"
+ cd "Rocket.Chat.Electron-$pkgver"
+ install -Dm644 "build/icons/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
+ install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+ install -d "$pkgdir/usr/lib/$pkgname/"
+ asar e "dist/${!CARCH}/resources/app.asar" "$pkgdir/usr/lib/$pkgname/"
}
diff --git a/rocketchat-desktop b/rocketchat-desktop
index 1dc4ec1b97df..5edafa6df1f9 100755
--- a/rocketchat-desktop
+++ b/rocketchat-desktop
@@ -1,2 +1,2 @@
#!/bin/sh
-exec electron11 /usr/lib/rocketchat-desktop.asar "$@"
+exec electron /usr/lib/rocketchat-desktop "$@"