upgpkg: rocketchat-desktop 2.17.3-2

Use system dictionaries

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28b6925d9b86..b7e607b1a620 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.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
@@ -18,10 +18,12 @@ pkgbase = rocketchat-desktop
 	source = rocketchat-desktop
 	source = rocketchat-desktop.desktop
 	source = fix-build.patch
+	source = use-system-dictionaries.patch
 	sha512sums = 40c90544c118337b7888feab24f787dc8c87faeb7f9aca237a37e906cf1210cdc762fad34f664feb75e317a5d2765bb619dd1f250c3ac74ea080c6a7c985c25c
 	sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d
 	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 	sha512sums = f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9
+	sha512sums = a571ec316822dff7c8f5c073a294ce7dbe788c37245647206afdd38f69c9a33730a3c8ad375ca68724f1b09fa6672ad194315c0abc175e28c84cb8a830a9f9d5
 
 pkgname = rocketchat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index f81684f2408b..57c006136563 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=rocketchat-desktop
 pkgver=2.17.3
 _srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=1
+pkgrel=2
 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
 arch=('i686' 'x86_64')
 url="https://github.com/RocketChat/Rocket.Chat.Electron"
@@ -15,11 +15,13 @@ conflicts=('rocketchat-client-bin')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         rocketchat-desktop
         rocketchat-desktop.desktop
-        fix-build.patch)
+        fix-build.patch
+        use-system-dictionaries.patch)
 sha512sums=('40c90544c118337b7888feab24f787dc8c87faeb7f9aca237a37e906cf1210cdc762fad34f664feb75e317a5d2765bb619dd1f250c3ac74ea080c6a7c985c25c'
             '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d'
             'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26'
-            'f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9')
+            'f614b29f3fb330e870edd51a3f1b9ca05c72c2c937a5a4d23797947751d55f8ac8db217f8edbe277e721c1a07f5bc84fd0be7a4903a7d991f7a9eb9625f34ce9'
+            'a571ec316822dff7c8f5c073a294ce7dbe788c37245647206afdd38f69c9a33730a3c8ad375ca68724f1b09fa6672ad194315c0abc175e28c84cb8a830a9f9d5')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
     _distname="linux-ia32-unpacked"
@@ -29,7 +31,7 @@ else
 fi
 
 prepare() {
-    for patch in fix-build.patch; do
+    for patch in fix-build.patch use-system-dictionaries.patch; do
         patch -N -p1 -d "$_srcname" -i "$srcdir/$patch"
     done
 
diff --git a/use-system-dictionaries.patch b/use-system-dictionaries.patch
new file mode 100644
index 000000000000..f771888a2e3c
--- /dev/null
+++ b/use-system-dictionaries.patch
@@ -0,0 +1,17 @@
+diff -ura package.orig/src/scripts/spellChecking.js package.new/src/scripts/spellChecking.js
+--- package.orig/src/scripts/spellChecking.js	2020-01-31 14:06:58.340723019 +0100
++++ package.new/src/scripts/spellChecking.js	2020-01-31 14:08:23.626144739 +0100
+@@ -113,12 +113,7 @@
+ export const setupSpellChecking = async () => {
+ 	const embeddedDictionaries = getAvailableDictionaries();
+ 
+-	dictionariesPath = path.join(
+-		remote.app.getAppPath(),
+-		remote.app.getAppPath().endsWith('app.asar') ? '..' : '.',
+-		'dictionaries',
+-	);
+-
++	dictionariesPath = '/usr/share/qt/qtwebengine_dictionaries'
+ 	const installedDictionaries = (await fs.promises.readdir(dictionariesPath, { encoding: 'utf8' }))
+ 		.filter((filename) => ['.bdic'].includes(path.extname(filename).toLowerCase()))
+ 		.map((filename) => path.basename(filename, path.extname(filename)).replace(/-/, '_'))