wire-desktop-git: remove hunspell, use tab width 4

2 files changed, 33 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42703665097a..9d1ac40f5b6c 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wire-desktop-git
 	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
-	pkgver = 3.5.2881.r14.g2b7ce57f
-	pkgrel = 2
+	pkgver = 3.5.2881.r45.g48cdf84b
+	pkgrel = 1
 	url = https://wire.com/
 	arch = x86_64
 	license = GPL3
@@ -12,7 +12,6 @@ pkgbase = wire-desktop-git
 	makedepends = yarn
 	depends = electron
 	depends = xdg-utils
-	optdepends = hunspell-en_US: for English spellcheck support
 	optdepends = emoji-font: colorful emoji
 	provides = wire-desktop
 	conflicts = wire-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 90f1e0253b06..655ec8618d75 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
 
 pkgname=wire-desktop-git
-_pkgname=${pkgname%-git}
-pkgver=3.5.2881.r14.g2b7ce57f
-pkgrel=2
+_name=${pkgname%-git}
+pkgver=3.5.2881.r45.g48cdf84b
+pkgrel=1
 pkgdesc='End-to-end encrypted messenger with file sharing, voice calls and video conferences'
 arch=('x86_64')
 url='https://wire.com/'
@@ -13,55 +13,52 @@ provides=('wire-desktop')
 conflicts=('wire-desktop')
 depends=('electron' 'xdg-utils')
 makedepends=('cargo' 'npm' 'python2' 'git' 'yarn')
-optdepends=('hunspell-en_US: for English spellcheck support'
-            'emoji-font: colorful emoji')
+optdepends=('emoji-font: colorful emoji')
 source=("git+https://github.com/wireapp/wire-desktop.git"
-        "${_pkgname}.desktop")
+        "${_name}.desktop")
 sha256sums=('SKIP'
             'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea')
 
 pkgver() {
-  cd "${_pkgname}"
-  git describe --tags | sed 's/linux\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${_name}"
+    git describe --tags | sed 's/linux\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  # Ensure we compile native extensions against system electron version
-  local electronver="$(sed 's/^[^0-9]*//' /usr/lib/electron/version)"
-  msg2 "Compiling against system electron version: $electronver"
-  sed -i 's/"electron": ".*"/"electron": "'"$electronver"'"/' "${_pkgname}/package.json"
+    # Ensure we compile native extensions against system electron version
+    local electronver="$(sed 's/^[^0-9]*//' /usr/lib/electron/version)"
+    msg2 "Compiling against system electron version: $electronver"
+    sed -i 's/"electron": ".*"/"electron": "'"$electronver"'"/' "${_name}/package.json"
 
-  # Create launcher script
-  cat << EOF > "${_pkgname}-launcher"
+    # Create launcher script
+    cat << EOF > "${_name}-launcher"
 #!/bin/sh
 
-electron "/usr/lib/${_pkgname}" "\$@"
+electron "/usr/lib/${_name}" "\$@"
 EOF
 }
 
 build() {
-  cd "${_pkgname}"
-  yarn
-  yarn build:ts
-  npx grunt 'clean:linux' 'update-keys' 'gitinfo' 'release-prod' 'bundle'
+    cd "${_name}"
+    yarn
+    yarn build:ts
+    npx grunt 'clean:linux' 'update-keys' 'gitinfo' 'release-prod' 'bundle'
 }
 
 package() {
-  # Place files
-  install -d "${pkgdir}/usr/lib/${_pkgname}"
-  cp -a "${_pkgname}/electron"/* "${pkgdir}/usr/lib/${_pkgname}"
+    # Place files
+    install -d "${pkgdir}/usr/lib/${_name}"
+    cp -a "${_name}/electron"/* "${pkgdir}/usr/lib/${_name}"
 
-  # Place launcher script
-  install -Dm755 "${_pkgname}-launcher" "${pkgdir}/usr/bin/${_pkgname}"
+    # Place launcher script
+    install -Dm755 "${_name}-launcher" "${pkgdir}/usr/bin/${_name}"
 
-  # Place desktop entry and icon
-  desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${_pkgname}.desktop"
-  local res
-  for res in 32x32 256x256; do
-    install -Dm644 "${_pkgname}/resources/icons/${res}.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${_pkgname}.png"
-  done
-
-  # Spellcheck dictionaries
-  rm -rf "${pkgdir}/usr/lib/${_pkgname}/node_modules/spellchecker/vendor/hunspell_dictionaries"
-  ln -s "/usr/share/hunspell" "${pkgdir}/usr/lib/${_pkgname}/node_modules/spellchecker/vendor/hunspell_dictionaries"
+    # Place desktop entry and icon
+    desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${_name}.desktop"
+    local res
+    for res in 32x32 256x256; do
+        install -Dm644 "${_name}/resources/icons/${res}.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${_name}.png"
+    done
 }
+
+# vim:set ts=4 sw=4 et: