summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Lisin2019-06-29 19:45:20 +0200
committerMatthias Lisin2019-06-29 19:45:20 +0200
commit3b22ca7b4a80d98efc3a6e86c89afcb0cab1a0a3 (patch)
treef9431aa07be9a594d31d783ab630a8725468c88a
parent88263cf4f9d9a395671ede21787a669088af950b (diff)
downloadaur-3b22ca7b4a80d98efc3a6e86c89afcb0cab1a0a3.tar.gz
upgpkg: rocketchat-desktop 2.15.3-2
Use electron4.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--fix-electron-builder.patch2
-rwxr-xr-xrocketchat-desktop2
4 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 955a209a3ca8..cde4edf426d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rocketchat-desktop
pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
pkgver = 2.15.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/RocketChat/Rocket.Chat.Electron
arch = i686
arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = rocketchat-desktop
makedepends = node-gyp
makedepends = python2
makedepends = yarn
- depends = electron
+ depends = electron4
optdepends = hunspell-en_US: spell checking
conflicts = rocketchat-client-bin
source = rocketchat-desktop-2.15.3.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.3.tar.gz
@@ -20,8 +20,8 @@ pkgbase = rocketchat-desktop
source = fix-spellchecking.patch
source = rocketchat-desktop.desktop
sha512sums = 58e2d68913ec600aa7323ba008065eaa1f41501a12d4c4d07d526ff722c35024b06bc20bdd93746076bc233368c686ab8f0fa204027001e6d30b792dd7d3ad54
- sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d
- sha512sums = f4c16d380156ebe32a226ebe639dc30d7a7fbcdaf1ee89e36eb5b8c736b207e16c3eff90b351d757d85f3612dacefe1cd0100371720d9d58ec229daa3ca654fb
+ sha512sums = 09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351
+ sha512sums = 23f7e0329ff74524076d42b8531cc94aea1b8f45758fafbf3f11cd11b50b1b943d572487217519888c85043d42562b4ef3ba0f99bddbc1f472318132d103ed7f
sha512sums = cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d
sha512sums = 030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8
sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
diff --git a/PKGBUILD b/PKGBUILD
index b435649f815f..9d7f77b619c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=rocketchat-desktop
pkgver=2.15.3
_srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=1
+pkgrel=2
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=('electron')
+depends=('electron4')
makedepends=('gulp' 'node-gyp' 'python2' 'yarn')
optdepends=('hunspell-en_US: spell checking')
conflicts=('rocketchat-client-bin')
@@ -19,8 +19,8 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
fix-spellchecking.patch
rocketchat-desktop.desktop)
sha512sums=('58e2d68913ec600aa7323ba008065eaa1f41501a12d4c4d07d526ff722c35024b06bc20bdd93746076bc233368c686ab8f0fa204027001e6d30b792dd7d3ad54'
- '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d'
- 'f4c16d380156ebe32a226ebe639dc30d7a7fbcdaf1ee89e36eb5b8c736b207e16c3eff90b351d757d85f3612dacefe1cd0100371720d9d58ec229daa3ca654fb'
+ '09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351'
+ '23f7e0329ff74524076d42b8531cc94aea1b8f45758fafbf3f11cd11b50b1b943d572487217519888c85043d42562b4ef3ba0f99bddbc1f472318132d103ed7f'
'cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d'
'030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8'
'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
@@ -40,7 +40,7 @@ prepare() {
build() {
cd "$_srcname"
- yarn upgrade "electron@$(sed 's/^v//' </usr/lib/electron/version)" --non-interactive --cache-folder "$srcdir/yarn-cache"
+ yarn upgrade "electron@$(sed 's/^v//' </usr/lib/electron4/version)" --non-interactive --cache-folder "$srcdir/yarn-cache"
yarn gulp build --env=production "$_releasename"
}
diff --git a/fix-electron-builder.patch b/fix-electron-builder.patch
index c345062c2bdb..6adb80ae28b9 100644
--- a/fix-electron-builder.patch
+++ b/fix-electron-builder.patch
@@ -6,7 +6,7 @@ diff -ura package.orig/electron-builder.json package.new/electron-builder.json
],
"artifactName": "rocketchat-${version}-${arch}.${ext}"
},
-+ "electronDist": "/usr/lib/electron",
++ "electronDist": "/usr/lib/electron4",
"linux": {
"target": [
- "tar.gz",
diff --git a/rocketchat-desktop b/rocketchat-desktop
index b4beaf01fb31..e3f286eba467 100755
--- a/rocketchat-desktop
+++ b/rocketchat-desktop
@@ -1,3 +1,3 @@
#!/bin/sh
-exec electron /usr/lib/rocketchat-desktop.asar "$@"
+exec electron4 /usr/lib/rocketchat-desktop.asar "$@"