fix icon

1 files changed, 25 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 46697cd9e443..ff16a7f86869 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
-# Contributor: Giovanni 'ItachiSan' Santini <giovannisantini93@yahoo.it>
 # Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
 
 pkgname=franz
@@ -7,21 +6,28 @@ _pkgver=5.0.0-beta.18
 pkgver=${_pkgver//-/_}
 pkgrel=1
 pkgdesc="Free messaging app for services like WhatsApp, Slack, Messenger and many more."
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="https://meetfranz.com"
 license=('Apache')
-depends=('nodejs' 'libx11' 'libxkbfile' 'libxext' 'libxss' 'gconf' 'gtk2' 'alsa-lib' 'nss' 'libxtst')
-makedepends=('npm' 'python2' 'git' 'hunspell')
+depends=('nodejs-ts-carbon' 'electron' 'libx11' 'libxkbfile' 'libxext' 'libxss' 'gconf' 'gtk2' 'alsa-lib' 'nss' 'libxtst')
+makedepends=('yarn' 'npm' 'python2' 'git')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/meetfranz/$pkgname/archive/v$_pkgver.tar.gz"
-        'franz.desktop')
-sha256sums=('24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2'
-            '79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8')
+        'franz.desktop'
+        'franz.sh')
+sha512sums=('26a7e86d9860138c0dc314c870881509f6a8a0fa9fc5f12cb6e9b03a11698b199d9e23adaf76511f525c7c8803bb8d7d8afc885f8cbae9287d30ee5b6f17662a'
+            'ef7c06558f60259dd29ead644327a0030c2c26637e51e3ec27a05542efd4752d68a3f4322973f6a90d6658686abce12700a3ad57aff9e517d0c907c952d7a034'
+            '8584507cfc2736f4736637925536b2c06063c59cd943346717633564ae88b64c5eea294c8897f1250812478ed493f54a470501e98e99d084a2ff012dff9671f8')
+
+prepare() {
+  # Fix electron-updater version
+  sed -i "s|\"electron-updater\":.*|\"electron-updater\": \"^3.0.3\",|g" \
+        $pkgname-$_pkgver/package.json
+}
 
 build() {
   cd $pkgname-$_pkgver
-
-  npm install --production --non-interactive
-  npm add electron-builder gulpjs/gulp#4.0
+  yarn install --production --non-interactive
+  yarn add 'electron-builder#28.0.0' 'gulpjs/gulp#4.0'
 
   # Better configuration for npm cache and calling installed binaries
   export npm_config_cache="$srcdir"/npm_cache
@@ -34,10 +40,14 @@ build() {
 package() {
   cd $pkgname-$_pkgver
 
-  install -d "$pkgdir"/usr/bin "$pkgdir"/usr/share
-  cp -r --no-preserve=ownership --preserve=mode out/linux-unpacked "$pkgdir"/usr/share/franz
+  # Install the .asar files
+  install -dm 755 "$pkgdir"/usr/lib/$pkgname
+  cp -r --no-preserve=ownership --preserve=mode out/linux-unpacked/resources "$pkgdir"/usr/lib/$pkgname/
+
+  # Install icon
+  install -Dm 644 "$srcdir"/franz.desktop "$pkgdir"/usr/share/applications/franz.desktop
+  install -Dm 644 build-helpers/images/icon.png "$pkgdir"/usr/share/icons/franz.png
 
-  install -Dm644 "$srcdir"/franz.desktop "$pkgdir"/usr/share/applications/franz.desktop
-  install -Dm644 build-helpers/images/icon.png "$pkgdir"/usr/share/icons/hicolor/1024x1024/apps/franz.png
-  ln -s /usr/share/franz/franz "$pkgdir"/usr/bin/franz
+  # Install run script
+  install -Dm 755 "$srcdir"/franz.sh "$pkgdir"/usr/bin/franz
 }