upgpkg: rocketchat-desktop 2.16.0-1

3 files changed, 37 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 860ddbe77130..9899a9e0f56a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.15.5
+	pkgver = 2.16.0
 	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = gulp
-	makedepends = nodejs<12
+	makedepends = nodejs
 	makedepends = node-gyp
 	makedepends = python2
 	makedepends = yarn
-	depends = electron4
+	depends = electron
 	optdepends = hunspell-en_US: spell checking
 	conflicts = rocketchat-client-bin
-	source = rocketchat-desktop-2.15.5.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.5.tar.gz
+	source = rocketchat-desktop-2.16.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.16.0.tar.gz
 	source = rocketchat-desktop
 	source = fix-build.patch
 	source = fix-spellchecking.patch
 	source = rocketchat-desktop.desktop
-	sha512sums = 9ca27c72a85f6139fe5351e865dc3fb13c95b92772747727d29c3adad2eac1808cb8f7671a28c76699b6ba8a76638baccd80f86d71367ac727e13420085a6d85
+	sha512sums = c6111ad391d9b62003d503274a60b32d0af3b79f58ee2caf35381d88cf861079f361f79977c3487b5eed999b8a4c45e5e0f79ebd0e0ad2168fd3c929de070f09
 	sha512sums = 09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351
-	sha512sums = a5ff43fc874ed0fe5afcd0851a7e6c4d4378314a5c82d796e3e124efb81fb7ce4065e0e0f585dc555ddcdcb8f4abab1626676da35bf9962e1db27e20b20f58d7
+	sha512sums = f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9
 	sha512sums = 030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 
diff --git a/PKGBUILD b/PKGBUILD
index 49d41e5006a9..6108befb31d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.15.5
+pkgver=2.16.0
 _srcname="Rocket.Chat.Electron-$pkgver"
 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=('electron4')
-makedepends=('gulp' 'nodejs<12' 'node-gyp' 'python2' 'yarn')
+depends=('electron')
+makedepends=('gulp' 'nodejs' 'node-gyp' 'python2' 'yarn')
 optdepends=('hunspell-en_US: spell checking')
 conflicts=('rocketchat-client-bin')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
@@ -17,9 +17,9 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         fix-build.patch
         fix-spellchecking.patch
         rocketchat-desktop.desktop)
-sha512sums=('9ca27c72a85f6139fe5351e865dc3fb13c95b92772747727d29c3adad2eac1808cb8f7671a28c76699b6ba8a76638baccd80f86d71367ac727e13420085a6d85'
+sha512sums=('c6111ad391d9b62003d503274a60b32d0af3b79f58ee2caf35381d88cf861079f361f79977c3487b5eed999b8a4c45e5e0f79ebd0e0ad2168fd3c929de070f09'
             '09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351'
-            'a5ff43fc874ed0fe5afcd0851a7e6c4d4378314a5c82d796e3e124efb81fb7ce4065e0e0f585dc555ddcdcb8f4abab1626676da35bf9962e1db27e20b20f58d7'
+            'f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9'
             '030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
 if [[ $CARCH == "i686" ]]; then
@@ -39,7 +39,7 @@ prepare() {
 build() {
     cd "$_srcname"
     yarn upgrade "electron@$(sed 's/^v//' </usr/lib/electron4/version)" --non-interactive --cache-folder "$srcdir/yarn-cache"
-    yarn gulp build --env=production "$_releasename"
+    NODE_ENV=production yarn gulp build "$_releasename"
 }
 
 package() {
diff --git a/fix-build.patch b/fix-build.patch
index b2558baedec2..013da24bb816 100644
--- a/fix-build.patch
+++ b/fix-build.patch
@@ -1,11 +1,11 @@
 diff -ura package.orig/electron-builder.json package.new/electron-builder.json
---- package.orig/electron-builder.json	2019-08-10 11:52:54.445603209 +0200
-+++ package.new/electron-builder.json	2019-08-10 11:56:04.277391817 +0200
-@@ -76,12 +76,10 @@
+--- package.orig/electron-builder.json	2019-10-11 21:15:47.916614387 +0200
++++ package.new/electron-builder.json	2019-10-11 21:25:14.248408458 +0200
+@@ -78,12 +78,10 @@
  		],
  		"artifactName": "rocketchat-${version}-${arch}.${ext}"
  	},
-+	"electronDist": "/usr/lib/electron4",
++	"electronDist": "/usr/lib/electron",
  	"linux": {
  		"target": [
 -			"tar.gz",
@@ -16,21 +16,27 @@ diff -ura package.orig/electron-builder.json package.new/electron-builder.json
  		],
  		"executableName": "rocketchat-desktop",
  		"category": "GNOME;GTK;Network;InstantMessaging",
-diff -ura package.orig/tasks/release.js package.new/tasks/release.js
---- package.orig/tasks/release.js	2019-08-10 11:52:54.482270211 +0200
-+++ package.new/tasks/release.js	2019-08-10 11:55:33.283760108 +0200
-@@ -16,6 +16,14 @@
- 	await build({ publish, x64, linux: [], c: { productName: 'rocketchat' } });
- });
+diff -ura package.orig/gulpfile.js package.new/gulpfile.js
+--- package.orig/gulpfile.js	2019-10-11 21:15:47.917614395 +0200
++++ package.new/gulpfile.js	2019-10-11 21:31:05.716040749 +0200
+@@ -65,6 +65,20 @@
+ 	c: { productName: 'rocketchat' },
+ }));
  
-+gulp.task('release:linux-x64', async() => {
-+	await build({ publish: 'never', x64, linux: [], c: { productName: 'rocketchat' } });
-+});
++task('release:linux-x64', () => build({
++	publish: 'never',
++	x64: true,
++	linux: [],
++	c: { productName: 'rocketchat' },
++}));
 +
-+gulp.task('release:linux-ia32', async() => {
-+	await build({ publish: 'never', ia32, linux: [], c: { productName: 'rocketchat' } });
-+});
++task('release:linux-ia32', () => build({
++	publish: 'never',
++	ia32: true,
++	linux: [],
++	c: { productName: 'rocketchat' },
++}));
 +
- gulp.task('release:win32', async () => {
- 	const publish = getEnv() === 'production' ? 'onTagOrDraft' : 'never';
- 	await build({ publish, x64, ia32, win: [] });
+ task('release:win32', () => build({
+ 	publish: NODE_ENV === 'production' ? 'onTagOrDraft' : 'never',
+ 	x64: true,