upgpkg: rocketchat-desktop 2.15.0-1

- Uses electron notifications now, no more notifications patch required.
- Depends on Electron 3 instead of 2. Actually 4 but it's not in the
Arch repositories yet.

6 files changed, 38 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a34b13198306..1065cfe2d97e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.14.7
-	pkgrel = 2
+	pkgver = 2.15.0
+	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
@@ -10,22 +10,20 @@ pkgbase = rocketchat-desktop
 	makedepends = node-gyp
 	makedepends = python2
 	makedepends = yarn
-	depends = electron2
+	depends = electron
 	optdepends = hunspell-en_US: spell checking
 	conflicts = rocketchat-client-bin
-	source = rocketchat-desktop-2.14.7.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.14.7.tar.gz
+	source = rocketchat-desktop-2.15.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.0.tar.gz
 	source = rocketchat-desktop
 	source = fix-linux-target.patch
 	source = fix-gulp-release.patch
 	source = fix-dictionaries.patch
-	source = fix-notification-timeout.patch
 	source = rocketchat-desktop.desktop
-	sha512sums = 383fd17ce50fd7aaba6e48627343ed4e3b570485c378507a364989758cd88c5db1c0e3ad3a1a409d1c6478370d211fb27bb142c053685601f24d31e5d5b0c2e8
-	sha512sums = 2b39f5728c7d7aff2f59a568c1e3c63816c72d1055743e7bb233aafe6370524e835d58995097480deaed864ac22aea54b5c450689eb18bee0bed0bc733810792
+	sha512sums = 91e342d7a50108894cc7fab6c362eaed32ee6bf47e5930622a319679e6904cdd84d86117f8799a0582b6ee4dd89e34133c988e1bd835c423d36f7afa94fe464e
+	sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d
 	sha512sums = 31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716
-	sha512sums = 796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a
-	sha512sums = ed0bc8884ea3c7ca50ae8f6aef415aecfac89f958939c1ccb6c86480a7210ead0df2fe0548e465fc1dd559436bae9db779d408e8a754e986cc8a976cd6590878
-	sha512sums = 3d7c614b88cfb7ecbbcafa729e1d41357747ae8d9e39e6eeef9a118be82b0839875f117dbef91c3a2e64c6a276a2bf82678872d8fd3b76a2952b665cd4b1a147
+	sha512sums = f8b32ae188366a1cfb7bdb7b1859f545dbf583a7ab3b2d793500688c85aae27b3df1ec926dd91795e47669535fa68ed762fdf0600384304ced16f6370dc0a67c
+	sha512sums = 60bd46cc0a708f83462f076b09e6afa9eb1caabcaf54f171d224e7059871dc960dbe6be8246a4b7eec889af7230a3534c3ba78e0b1be2b0705f00eb36550452b
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 
 pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 773bb3d28998..c38e23ae16cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.14.7
+pkgver=2.15.0
 _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=('electron2')
+depends=('electron')
 makedepends=('nodejs' 'node-gyp' 'python2' 'yarn')
 optdepends=('hunspell-en_US: spell checking')
 conflicts=('rocketchat-client-bin')
@@ -17,14 +17,12 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Elec
         fix-linux-target.patch
         fix-gulp-release.patch
         fix-dictionaries.patch
-        fix-notification-timeout.patch
         rocketchat-desktop.desktop)
-sha512sums=('383fd17ce50fd7aaba6e48627343ed4e3b570485c378507a364989758cd88c5db1c0e3ad3a1a409d1c6478370d211fb27bb142c053685601f24d31e5d5b0c2e8'
-            '2b39f5728c7d7aff2f59a568c1e3c63816c72d1055743e7bb233aafe6370524e835d58995097480deaed864ac22aea54b5c450689eb18bee0bed0bc733810792'
+sha512sums=('91e342d7a50108894cc7fab6c362eaed32ee6bf47e5930622a319679e6904cdd84d86117f8799a0582b6ee4dd89e34133c988e1bd835c423d36f7afa94fe464e'
+            '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d'
             '31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716'
-            '796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a'
-            'ed0bc8884ea3c7ca50ae8f6aef415aecfac89f958939c1ccb6c86480a7210ead0df2fe0548e465fc1dd559436bae9db779d408e8a754e986cc8a976cd6590878'
-            '3d7c614b88cfb7ecbbcafa729e1d41357747ae8d9e39e6eeef9a118be82b0839875f117dbef91c3a2e64c6a276a2bf82678872d8fd3b76a2952b665cd4b1a147'
+            'f8b32ae188366a1cfb7bdb7b1859f545dbf583a7ab3b2d793500688c85aae27b3df1ec926dd91795e47669535fa68ed762fdf0600384304ced16f6370dc0a67c'
+            '60bd46cc0a708f83462f076b09e6afa9eb1caabcaf54f171d224e7059871dc960dbe6be8246a4b7eec889af7230a3534c3ba78e0b1be2b0705f00eb36550452b'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
@@ -42,7 +40,8 @@ prepare() {
 
 build() {
     cd "$_srcname"
-    yarn install --non-interactive --pure-lockfile --cache-folder "$srcdir/yarn-cache"
+    #yarn install --non-interactive --pure-lockfile --cache-folder "$srcdir/yarn-cache"
+    yarn upgrade electron@^3.1.4 --non-interactive --cache-folder "$srcdir/yarn-cache"
     yarn build --env=production "$_releasename"
 }
 
diff --git a/fix-dictionaries.patch b/fix-dictionaries.patch
index 4c7ea91cb285..7eb148dbaca4 100644
--- a/fix-dictionaries.patch
+++ b/fix-dictionaries.patch
@@ -1,20 +1,12 @@
-diff -ura package.orig/src/public/lib/SpellCheck.js package.new/src/public/lib/SpellCheck.js
---- package.orig/src/public/lib/SpellCheck.js	2018-12-31 23:10:21.364014246 +0100
-+++ package.new/src/public/lib/SpellCheck.js	2018-12-31 23:21:27.153584606 +0100
-@@ -156,12 +156,10 @@
- 		if (this.availableDictionaries.length === 0) {
- 			this.multiLanguage = false;
- 			// Dictionaries path is correct for build
--			this.dictionariesPath = path.join(
--				app.getAppPath(),
--				app.getAppPath().endsWith('app.asar') ? '..' : '.',
--				'dictionaries'
--			);
--			this.getDictionariesFromInstallDirectory();
-+			if (fs.existsSync('/usr/share/hunspell')) {
-+				this.dictionariesPath = '/usr/share/hunspell';
-+				this.getDictionariesFromInstallDirectory();
-+			}
- 		} else {
- 			this.multiLanguage = process.platform !== 'win32';
- 			this.availableDictionaries = this.availableDictionaries.map((dict) => dict.replace('-', '_'));
+diff -ura package.orig/src/preload/spellchecking.js package.new/src/preload/spellchecking.js
+--- package.orig/src/preload/spellchecking.js	2019-02-24 19:52:13.168606313 +0100
++++ package.new/src/preload/spellchecking.js	2019-02-24 19:52:55.662351780 +0100
+@@ -21,7 +21,7 @@
+ 	async loadDictionaries() {
+ 		const embeddedDictionaries = spellchecker.getAvailableDictionaries();
+ 
+-		const directory = jetpack.cwd(app.getAppPath(), app.getAppPath().endsWith('app.asar') ? '..' : '.', 'dictionaries');
++		const directory = jetpack.cwd('/usr/share/hunspell');
+ 		const installedDictionaries = (await directory.findAsync({ matching: '*.{aff,dic}' }))
+ 			.map((fileName) => path.basename(fileName, path.extname(fileName)));
+ 
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
index 9f8c8fb3152f..d3065bae393e 100644
--- a/fix-gulp-release.patch
+++ b/fix-gulp-release.patch
@@ -1,8 +1,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';
+--- package.orig/tasks/release.js	2019-02-24 19:19:17.230601550 +0100
++++ package.new/tasks/release.js	2019-02-24 19:22:03.772035574 +0100
+@@ -8,10 +8,5 @@
+ const publish = env !== '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', async() => {
@@ -10,7 +10,7 @@ diff -ura package.orig/tasks/release.js package.new/tasks/release.js
 -	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));
+-
+-gulp.task('release', gulp.series('build-app', `release:${ process.platform }`));
++gulp.task('release:linux-x64', () => build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } }));
++gulp.task('release:linux-ia32', () => build({ publish, ia32: true, linux: [], c: { productName: 'rocketchat' } }));
diff --git a/fix-notification-timeout.patch b/fix-notification-timeout.patch
deleted file mode 100644
index e457d739d03b..000000000000
--- a/fix-notification-timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ura package.orig/src/background/notifications.js package.new/src/background/notifications.js
---- package.orig/src/background/notifications.js	2019-02-13 15:37:30.716402425 +0100
-+++ package.new/src/background/notifications.js	2019-02-13 15:38:08.933377619 +0100
-@@ -86,7 +86,6 @@
- 			body: body && this.escapeBody(body),
- 			icon: icon ? path.resolve(icon) : 'info',
- 			appName: app.getName(),
--			timeout: 24 * 60 * 60 * 1000,
- 			sound: silent ? undefined : 'message-new-instant',
- 			actions: process.env.XDG_CURRENT_DESKTOP !== 'Unity' ? {
- 				default: '',
diff --git a/rocketchat-desktop b/rocketchat-desktop
index 7cecf59d3de8..b4beaf01fb31 100755
--- a/rocketchat-desktop
+++ b/rocketchat-desktop
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec electron2 /usr/lib/rocketchat-desktop.asar "$@"
+exec electron /usr/lib/rocketchat-desktop.asar "$@"