upgpkg: rocketchat-desktop 2.15.5-1

5 files changed, 49 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cde4edf426d3..860ddbe77130 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,27 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.15.3
-	pkgrel = 2
+	pkgver = 2.15.5
+	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = gulp
+	makedepends = nodejs<12
 	makedepends = node-gyp
 	makedepends = python2
 	makedepends = yarn
 	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
+	source = rocketchat-desktop-2.15.5.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.5.tar.gz
 	source = rocketchat-desktop
-	source = fix-electron-builder.patch
-	source = fix-gulp-release.patch
+	source = fix-build.patch
 	source = fix-spellchecking.patch
 	source = rocketchat-desktop.desktop
-	sha512sums = 58e2d68913ec600aa7323ba008065eaa1f41501a12d4c4d07d526ff722c35024b06bc20bdd93746076bc233368c686ab8f0fa204027001e6d30b792dd7d3ad54
+	sha512sums = 9ca27c72a85f6139fe5351e865dc3fb13c95b92772747727d29c3adad2eac1808cb8f7671a28c76699b6ba8a76638baccd80f86d71367ac727e13420085a6d85
 	sha512sums = 09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351
-	sha512sums = 23f7e0329ff74524076d42b8531cc94aea1b8f45758fafbf3f11cd11b50b1b943d572487217519888c85043d42562b4ef3ba0f99bddbc1f472318132d103ed7f
-	sha512sums = cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d
+	sha512sums = a5ff43fc874ed0fe5afcd0851a7e6c4d4378314a5c82d796e3e124efb81fb7ce4065e0e0f585dc555ddcdcb8f4abab1626676da35bf9962e1db27e20b20f58d7
 	sha512sums = 030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d7f77b619c1..49d41e5006a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,25 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.15.3
+pkgver=2.15.5
 _srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=2
+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' 'node-gyp' 'python2' 'yarn')
+makedepends=('gulp' 'nodejs<12' 'node-gyp' 'python2' 'yarn')
 optdepends=('hunspell-en_US: spell checking')
 conflicts=('rocketchat-client-bin')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         rocketchat-desktop
-        fix-electron-builder.patch
-        fix-gulp-release.patch
+        fix-build.patch
         fix-spellchecking.patch
         rocketchat-desktop.desktop)
-sha512sums=('58e2d68913ec600aa7323ba008065eaa1f41501a12d4c4d07d526ff722c35024b06bc20bdd93746076bc233368c686ab8f0fa204027001e6d30b792dd7d3ad54'
+sha512sums=('9ca27c72a85f6139fe5351e865dc3fb13c95b92772747727d29c3adad2eac1808cb8f7671a28c76699b6ba8a76638baccd80f86d71367ac727e13420085a6d85'
             '09c770d09973ce0aa2299c9162788d387fc558e95ad0b11596e199a6c67edc5c5258e8ec4bd73c84b494a1d20931fc50c16efc74311930158edd8cf704285351'
-            '23f7e0329ff74524076d42b8531cc94aea1b8f45758fafbf3f11cd11b50b1b943d572487217519888c85043d42562b4ef3ba0f99bddbc1f472318132d103ed7f'
-            'cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d'
+            'a5ff43fc874ed0fe5afcd0851a7e6c4d4378314a5c82d796e3e124efb81fb7ce4065e0e0f585dc555ddcdcb8f4abab1626676da35bf9962e1db27e20b20f58d7'
             '030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
 if [[ $CARCH == "i686" ]]; then
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 000000000000..b2558baedec2
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,36 @@
+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 @@
+ 		],
+ 		"artifactName": "rocketchat-${version}-${arch}.${ext}"
+ 	},
++	"electronDist": "/usr/lib/electron4",
+ 	"linux": {
+ 		"target": [
+-			"tar.gz",
+-			"deb",
+-			"rpm",
+-			"snap"
++			"dir"
+ 		],
+ 		"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' } });
+ });
+ 
++gulp.task('release:linux-x64', async() => {
++	await build({ publish: 'never', x64, linux: [], c: { productName: 'rocketchat' } });
++});
++
++gulp.task('release:linux-ia32', async() => {
++	await build({ publish: 'never', ia32, linux: [], c: { productName: 'rocketchat' } });
++});
++
+ gulp.task('release:win32', async () => {
+ 	const publish = getEnv() === 'production' ? 'onTagOrDraft' : 'never';
+ 	await build({ publish, x64, ia32, win: [] });
diff --git a/fix-electron-builder.patch b/fix-electron-builder.patch
deleted file mode 100644
index 6adb80ae28b9..000000000000
--- a/fix-electron-builder.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Only in package.new/: Rocket.Chat.Electron-2.15.0
-diff -ura package.orig/electron-builder.json package.new/electron-builder.json
---- package.orig/electron-builder.json	2019-02-28 10:01:42.724497392 +0100
-+++ package.new/electron-builder.json	2019-02-28 10:01:21.624276060 +0100
-@@ -78,12 +78,10 @@
-     ],
-     "artifactName": "rocketchat-${version}-${arch}.${ext}"
-   },
-+  "electronDist": "/usr/lib/electron4",
-   "linux": {
-     "target": [
--      "tar.gz",
--      "deb",
--      "rpm",
--      "snap"
-+      "dir"
-     ],
-     "executableName": "rocketchat-desktop",
-     "category": "GNOME;GTK;Network;InstantMessaging",
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
deleted file mode 100644
index 97a54f3775e4..000000000000
--- a/fix-gulp-release.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ura package.orig/tasks/release.js package.new/tasks/release.js
---- package.orig/tasks/release.js	2019-03-13 20:47:32.334253693 +0100
-+++ package.new/tasks/release.js	2019-03-13 20:57:20.456395083 +0100
-@@ -11,6 +11,14 @@
- 	await build({ publish, x64, mac: [] });
- });
- 
-+gulp.task('release:linux-x64', async() => {
-+    await build({ publish: 'never', x64, linux: [], c: { productName: 'rocketchat' } });
-+});
-+
-+gulp.task('release:linux-ia32', async() => {
-+    await build({ publish: 'never', ia32, linux: [], c: { productName: 'rocketchat' } });
-+});
-+
- gulp.task('release:linux', async() => {
- 	const { linux: { target } } = require('../electron-builder.json');
- 	const publish = getEnv() === 'production' ? 'onTagOrDraft' : 'never';