upgpkg: rocketchat-desktop-2.14.0-1

Removed version pinning. Go with the flow or die.
Removed sed from makedepends.
Renewed the patches since one failed to apply.

4 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c8789e45257..1cd91b27ae89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,28 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.13.3
+	pkgver = 2.14.0
 	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = sed
-	makedepends = yarn>=0.21.3
-	makedepends = nodejs>=7.0.0
+	makedepends = nodejs
 	makedepends = node-gyp
 	makedepends = python2
+	makedepends = yarn
 	depends = nss
 	depends = libxss
 	depends = gconf
 	depends = gtk3
 	depends = glibc
 	conflicts = rocketchat-client-bin
-	source = rocketchat-desktop-2.13.3.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.13.3.tar.gz
+	source = rocketchat-desktop-2.14.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.14.0.tar.gz
 	source = fix-linux-target.patch
 	source = fix-gulp-release.patch
 	source = rocketchat-desktop.desktop
-	sha512sums = 1d63816c8667b27ab90f336dc67ad352b26c0dd3a419e82a3a169e5d3a38fcc58ac91bd3b3e1ecbb5611c49493fd86972a8bd59c9a858ba2bd1e36b751edbbaf
-	sha512sums = 8a2753f6cffa7779cc9c008c872d24c8c6c20307886ec62f124a26249c1e96d0dcf1fd2529c6a335b2f1eea533cf24c9a2ca486794452b0190e14b5d47c8c0b5
-	sha512sums = 043a9b4ed2eddbb93404eab70cc2238bde5930d97c1bf88c1e49eddf61e960db19b996e5ffd9fd65062041fc0726d8ca5f9a4d5436e753260fda482a9544bbf3
+	sha512sums = 3b90120d7fed1af17d244d4e546170beabbc59602ef1733860f8123d4460d23dcf719ec686f022597a6928489bea804f70b2ed665f55447ecb4f3b792cea4dec
+	sha512sums = 31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716
+	sha512sums = 796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 
 pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index d3ef350ba858..8a4d8ead49e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.13.3
+pkgver=2.14.0
 _srcname="Rocket.Chat.Electron-$pkgver"
 pkgrel=1
 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
@@ -9,15 +9,15 @@ arch=('i686' 'x86_64')
 url="https://github.com/RocketChat/Rocket.Chat.Electron"
 license=('MIT')
 depends=('nss' 'libxss' 'gconf' 'gtk3' 'glibc')
-makedepends=('sed' 'yarn>=0.21.3' 'nodejs>=7.0.0' 'node-gyp' 'python2')
+makedepends=('nodejs' 'node-gyp' 'python2' 'yarn')
 conflicts=('rocketchat-client-bin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz"
         fix-linux-target.patch
         fix-gulp-release.patch
         rocketchat-desktop.desktop)
-sha512sums=('1d63816c8667b27ab90f336dc67ad352b26c0dd3a419e82a3a169e5d3a38fcc58ac91bd3b3e1ecbb5611c49493fd86972a8bd59c9a858ba2bd1e36b751edbbaf'
-            '8a2753f6cffa7779cc9c008c872d24c8c6c20307886ec62f124a26249c1e96d0dcf1fd2529c6a335b2f1eea533cf24c9a2ca486794452b0190e14b5d47c8c0b5'
-            '043a9b4ed2eddbb93404eab70cc2238bde5930d97c1bf88c1e49eddf61e960db19b996e5ffd9fd65062041fc0726d8ca5f9a4d5436e753260fda482a9544bbf3'
+sha512sums=('3b90120d7fed1af17d244d4e546170beabbc59602ef1733860f8123d4460d23dcf719ec686f022597a6928489bea804f70b2ed665f55447ecb4f3b792cea4dec'
+            '31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716'
+            '796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
index f716c27978a2..9f8c8fb3152f 100644
--- a/fix-gulp-release.patch
+++ b/fix-gulp-release.patch
@@ -1,12 +1,16 @@
-diff -ura '--exclude=electron-builder.json' package.orig/tasks/release.js package.new/tasks/release.js
---- package.orig/tasks/release.js	2018-09-10 09:55:15.444036168 +0200
-+++ package.new/tasks/release.js	2018-09-10 10:01:28.053423434 +0200
-@@ -9,6 +9,8 @@
+diff -ura package.orig/tasks/release.js package.new/tasks/release.js
+--- package.orig/tasks/release.js	2018-10-11 11:21:11.827710902 +0200
++++ package.new/tasks/release.js	2018-10-11 11:23:28.795072470 +0200
+@@ -9,10 +9,7 @@
  const publish = getEnvName() !== 'production' ? 'never' : 'onTagOrDraft';
  gulp.task('release:darwin', () => build({ publish, x64: true, mac: [] }));
- gulp.task('release:win32', () => build({ publish, x64: true, ia32: true, win: [ 'nsis', 'appx' ] }));
-+gulp.task('release:linux-x64', () => build({ x64: true, linux: [], c: { productName: 'rocketchat' } })); 
-+gulp.task('release:linux-ia32', () => build({ ia32: true, linux: [], c: { productName: 'rocketchat' } })); 
- gulp.task('release:linux', (cb) => {
-     build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } })
-         .then(() => build({
+ gulp.task('release:win32', () => build({ publish, x64: true, ia32: true, win: ['nsis', 'appx'] }));
+-gulp.task('release:linux', async() => {
+-	const allLinuxTargetsButSnap = config.linux.target.filter((target) => target !== 'snap');
+-	await build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } });
+-	await build({ publish, ia32: true, linux: allLinuxTargetsButSnap, c: { productName: 'rocketchat' } });
+-});
++gulp.task('release:linux-x64', () => build({ x64: true, linux: [], c: { productName: 'rocketchat' } }));
++gulp.task('release:linux-ia32', () => build({ ia32: true, linux: [], c: { productName: 'rocketchat' } }));
+ 
+ gulp.task('release', (cb) => runSequence('build-app', `release:${ process.platform }`, cb));
diff --git a/fix-linux-target.patch b/fix-linux-target.patch
index 3cd152fb744e..c37435155836 100644
--- a/fix-linux-target.patch
+++ b/fix-linux-target.patch
@@ -1,7 +1,7 @@
 diff -ura package.orig/electron-builder.json package.new/electron-builder.json
---- package.orig/electron-builder.json	2018-09-10 09:55:15.434036072 +0200
-+++ package.new/electron-builder.json	2018-09-10 09:55:34.767553057 +0200
-@@ -63,10 +63,7 @@
+--- package.orig/electron-builder.json	2018-10-11 11:21:11.824377553 +0200
++++ package.new/electron-builder.json	2018-10-11 11:21:31.057808503 +0200
+@@ -76,10 +76,7 @@
    },
    "linux": {
      "target": [