Fix dependencies and reduce build time

2 files changed, 52 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cad28d2d9326..22059b7ba544 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,24 @@
 pkgbase = mattermost-desktop
-	pkgdesc = Mattermost Desktop (Beta) for Linux
+	pkgdesc = Mattermost Desktop application for Linux (Beta)
 	pkgver = 3.5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/mattermost/desktop
 	arch = i686
 	arch = x86_64
-	license = MIT
+	license = Apache
 	makedepends = npm
 	makedepends = gendesk
 	makedepends = libicns
 	makedepends = graphicsmagick
+	depends = gtk2
+	depends = libxtst
+	depends = libxss
 	depends = gconf
+	depends = nss
+	depends = nspr
+	depends = alsa-lib
 	source = https://github.com/mattermost/desktop/archive/v3.5.0.tar.gz
-	sha256sums = 9948a5647906c6e759961072f838cebb38c5649a112fe9d053b90ec13e2c564c
+	sha512sums = 06924e4ce18cbe8fd50c0742a74b0a2ec732c7a419bb741c6991097a0a7be01afdfc4ce43125856508aa06750e35d12ce34d06a1e5d6eb6ddd14e81a0a6dffba
 
 pkgname = mattermost-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 7354ffa2f452..e536ccad46fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,65 @@
-# Maintainer: Jan Was <janek.jan(at)gmail(dot)com>
+# Maintainer: William Gathoye <william at gathoye dot be>
+# Contributor: Jan Was <janek dot jan at gmail dot com>
 
 pkgname=mattermost-desktop
-pkgdesc="Mattermost chat desktop client for Linux"
-_pkgname=desktop
 pkgver=3.5.0
-pkgrel=2
-pkgdesc="Mattermost Desktop (Beta) for Linux"
+pkgrel=3
+pkgdesc="Mattermost Desktop application for Linux (Beta)"
 arch=('i686' 'x86_64')
+
 url="https://github.com/mattermost/desktop"
-license=('MIT')
+license=('Apache')
+
 makedepends=('npm' 'gendesk' 'libicns' 'graphicsmagick')
-depends=('gconf' 'nodejs' 'ffmpeg')
+depends=('gtk2' 'libxtst' 'libxss' 'gconf' 'nss' 'nspr' 'alsa-lib')
 optdepends=()
 
 source=("https://github.com/mattermost/desktop/archive/v${pkgver}.tar.gz")
+sha512sums=('06924e4ce18cbe8fd50c0742a74b0a2ec732c7a419bb741c6991097a0a7be01afdfc4ce43125856508aa06750e35d12ce34d06a1e5d6eb6ddd14e81a0a6dffba')
+
+prepare() {
+    cd "${srcdir}/desktop-${pkgver}"
 
-sha256sums=('9948a5647906c6e759961072f838cebb38c5649a112fe9d053b90ec13e2c564c')
+    # Depending on the architecture, in order to accelerate the build process,
+    # removes the compilation of ia32 or x64 build.
+    case "$CARCH" in
+        i686)
+            sed -i 's/build --linux --x64 --ia32/build --linux --ia32/g' package.json
+            ;;
+        x86_64)
+            sed -i 's/build --linux --x64 --ia32/build --linux --x64/g' package.json
+            ;;
+    esac
+
+    # Generate a desktop entry
+    # -f: forces and overrides the file if any
+    # -n: do not download an icon
+    # This tool assumes the icon has the same name as pkgname.
+    # For categories see https://standards.freedesktop.org/menu-spec/latest/apa.html
+    gendesk -f -n \
+        --pkgname "$pkgname" \
+        --pkgdesc "Open source, private cloud Slack-alternative" \
+        --name "Mattermost Desktop (Beta)" \
+        --exec "/usr/lib/mattermost/mattermost-desktop" \
+        --categories "Network;Chat;InstantMessaging;VideoConference;GTK"
+}
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/desktop-${pkgver}"
     npm install
     npm run package:linux
 }
 
-prepare() {
-    gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
-        --exec "/usr/lib/mattermost/mattermost-desktop" \
-        --categories "GNOME;GTK;Network;InstantMessaging;"
-}
-
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/desktop-${pkgver}"
 
     install -d -m 755 "${pkgdir}"/usr/lib
     case "$CARCH" in
-        i686) _release="linux-ia32-unpacked"
+        i686)
+            _release="linux-ia32-unpacked"
             ;;
-        x86_64) _release="linux-unpacked"
+        x86_64)
+            _release="linux-unpacked"
             ;;
     esac
 
@@ -47,7 +70,7 @@ package() {
 
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
     install -Dm644 "$pkgdir/usr/lib/mattermost/icon.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }