upgpkg: rocketchat-desktop 2.17.6-1

Back to plaintext hunspell dicts we go

4 files changed, 28 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 900d733e92ec..d873f993f770 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.17.5
-	pkgrel = 2
+	pkgver = 2.17.6
+	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
@@ -14,16 +14,16 @@ pkgbase = rocketchat-desktop
 	depends = electron
 	optdepends = hunspell-en_US: spell checking
 	conflicts = rocketchat-client-bin
-	source = rocketchat-desktop-2.17.5.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.17.5.tar.gz
+	source = rocketchat-desktop-2.17.6.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.17.6.tar.gz
 	source = rocketchat-desktop
 	source = rocketchat-desktop.desktop
 	source = fix-build.patch
 	source = use-system-dictionaries.patch
-	sha512sums = 9f081256ab86830dd34623744d209229454c8fcd1bab7bda62b68c874a3a1d957ea516b1be5ac3648a644b9da2f74d9478667aa567fb4035c25616da30ab0c7a
+	sha512sums = aa85d2477a3a23fe7b60ff3be41959deef86aacc468b747af8748ec79ac104b54d004d5e89ff52bebab02b8ce3474036d2854e4b6308fe5b71b86ab69b73bef0
 	sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
-	sha512sums = f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9
-	sha512sums = bf4edfa22a6819c2437f60f201c52195cf1fd1e5e7c82e02ef78d3beb37becf28d321b1ef1980d2084fe439b8004e5f44acf09cef79d42fb35c6363463435357
+	sha512sums = ae924a722734962432c795f051dc35771c0347b655845fcb614c3424674e23aca071708ae0b84b19794b6f532af7a409ca078ff0f60db0ee88a8bcb09f78c1ab
+	sha512sums = 88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b
 
 pkgname = rocketchat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d9227cdbef5..2f0f3620205e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.17.5
+pkgver=2.17.6
 _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"
@@ -17,11 +17,11 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         rocketchat-desktop.desktop
         fix-build.patch
         use-system-dictionaries.patch)
-sha512sums=('9f081256ab86830dd34623744d209229454c8fcd1bab7bda62b68c874a3a1d957ea516b1be5ac3648a644b9da2f74d9478667aa567fb4035c25616da30ab0c7a'
+sha512sums=('aa85d2477a3a23fe7b60ff3be41959deef86aacc468b747af8748ec79ac104b54d004d5e89ff52bebab02b8ce3474036d2854e4b6308fe5b71b86ab69b73bef0'
             '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26'
-            'f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9'
-            'bf4edfa22a6819c2437f60f201c52195cf1fd1e5e7c82e02ef78d3beb37becf28d321b1ef1980d2084fe439b8004e5f44acf09cef79d42fb35c6363463435357')
+            'ae924a722734962432c795f051dc35771c0347b655845fcb614c3424674e23aca071708ae0b84b19794b6f532af7a409ca078ff0f60db0ee88a8bcb09f78c1ab'
+            '88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
     _distname="linux-ia32-unpacked"
@@ -41,7 +41,8 @@ prepare() {
 
 build() {
     cd "$_srcname"
-    NODE_ENV=production yarn --cache-folder="$srcdir/yarn-cache" gulp build "$_releasename"
+    NODE_ENV=production yarn --cache-folder="$srcdir/yarn-cache" gulp build
+    NODE_ENV=production yarn --cache-folder="$srcdir/yarn-cache" gulp "$_releasename"
 }
 
 package() {
diff --git a/fix-build.patch b/fix-build.patch
index 013da24bb816..12f42f138501 100644
--- a/fix-build.patch
+++ b/fix-build.patch
@@ -1,7 +1,7 @@
 diff -ura package.orig/electron-builder.json package.new/electron-builder.json
---- 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 @@
+--- package.orig/electron-builder.json	2020-02-11 13:55:00.000000000 +0100
++++ package.new/electron-builder.json	2020-02-11 15:44:30.577329034 +0100
+@@ -83,12 +83,10 @@
  		],
  		"artifactName": "rocketchat-${version}-${arch}.${ext}"
  	},
@@ -17,9 +17,9 @@ diff -ura package.orig/electron-builder.json package.new/electron-builder.json
  		"executableName": "rocketchat-desktop",
  		"category": "GNOME;GTK;Network;InstantMessaging",
 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 @@
+--- package.orig/gulpfile.js	2020-02-11 13:55:00.000000000 +0100
++++ package.new/gulpfile.js	2020-02-11 15:43:14.856730664 +0100
+@@ -62,6 +62,20 @@
  	c: { productName: 'rocketchat' },
  }));
  
diff --git a/use-system-dictionaries.patch b/use-system-dictionaries.patch
index 9e74973e2cb3..f6618556d14b 100644
--- a/use-system-dictionaries.patch
+++ b/use-system-dictionaries.patch
@@ -1,25 +1,16 @@
 diff -ura package.orig/src/scripts/spellChecking.js package.new/src/scripts/spellChecking.js
---- package.orig/src/scripts/spellChecking.js	2020-02-04 20:01:17.366294000 +0100
-+++ package.new/src/scripts/spellChecking.js	2020-02-04 20:26:35.530104166 +0100
-@@ -74,7 +74,7 @@
- const registerSpellCheckingDictionary = async (dictionary) => {
- 	let args;
- 	try {
--		const dictionaryPath = path.join(dictionariesPath, `${ dictionary.replace(/_/g, '-') }.bdic`);
-+		const dictionaryPath = path.join(dictionariesPath, `${dictionary}.bdic`);
- 		args = [dictionary, await fs.promises.readFile(dictionaryPath)];
- 	} catch (error) {
- 		args = [dictionary];
-@@ -117,11 +117,7 @@
- export const setupSpellChecking = async () => {
- 	const embeddedDictionaries = getAvailableDictionaries();
+--- package.orig/src/scripts/spellChecking.js	2020-02-11 13:55:00.000000000 +0100
++++ package.new/src/scripts/spellChecking.js	2020-02-11 15:52:41.031198167 +0100
+@@ -140,11 +140,7 @@
  
--	dictionariesPath = path.join(
+ 	await provider.initialize();
+ 
+-	const appDirectoriesPath = path.join(
 -		remote.app.getAppPath(),
 -		remote.app.getAppPath().endsWith('app.asar') ? '..' : '.',
 -		'dictionaries',
 -	);
-+	dictionariesPath = '/usr/share/qt/qtwebengine_dictionaries';
++	const appDirectoriesPath = '/usr/share/hunspell';
+ 
+ 	const appDictionaries = await getPairsOfDictionaryFiles(appDirectoriesPath);
  
- 	let installedDictionaries = [];
- 	if (process.platform !== 'darwin') {