update to v4.0.0, and build from source as this package should've done from the start

3 files changed, 38 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 0c2ccb8d0196..464ea1267f04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/*.zip
+/*.tar.gz
 /*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 82edafdb5225..a2207ba2e25e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,40 @@
 # Contributor: kaptoxic <kaptoxic at yahoo dot com>
 # Contributor: Matthew Avant <matthew dot avant at gmail dot com>
 # Contributor: Rose Ames <rose at happyspork dot com>
+# Contributor: Jean Lucas <jean@4ray.co>
 
 pkgname=zulip-desktop
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Zulip Desktop Client - Workplace chat that improves your productivity."
-url="https://zulipchat.com"
-arch=('x86_64')
-license=('Apache')
-source=("https://github.com/zulip/zulip-desktop/releases/download/v$pkgver/Zulip-$pkgver-linux-x64.zip")
-sha256sums=('5267c3f232f12440556a7ca0f59b4c12537672e96882e33a512ccd2eeee83b3c')
+pkgver=4.0.0
+pkgrel=2
+pkgdesc='Real-time team chat based on the email threading model'
+arch=(i686 x86_64)
+url=https://zulipchat.com
+license=(Apache)
+depends=(alsa-lib atk at-spi2-atk cairo dbus fontconfig gdk-pixbuf2 glib2 gtk3 hicolor-icon-theme libcups libxcomposite libxcursor libxdamage libxext libxfixes libxi libxkbfile libxrandr libxrender libxss libxtst nspr nss pango)
+makedepends=(npm python2 libxkbfile)
+source=(https://github.com/zulip/$pkgname/archive/v$pkgver.tar.gz
+        zulip.desktop)
+sha512sums=('4cbdbc73d09ac50599cba460eccd0b72c901b68a00d4995b9bc16f0f980715155cafc1f14a5d1ab5a97672c5413679ce96f38212f7e0935df85b1c0f1e3465ec'
+            '396b3a3df1ca9fa61d2283eca60c71549e0db76e82b49afdd16c5d1d01fc42c18185555cd5e247e1a039ee998c5a1fd6b73886a67a10bdbadb54132769a58fa5')
 
-prepare() {
-  # Remove symlink to source archive
-  rm -f "$(basename "${source[0]}")"
+build() {
+  cd $pkgname-$pkgver
+  npm install
 }
 
 package() {
-  # Install the whole archive in that folder
-  install -dm755 "$pkgdir"/usr/lib/$pkgname
-  mv * "$pkgdir"/usr/lib/$pkgname/
+  install -Dm 644 zulip.desktop -t "$pkgdir"/usr/share/applications
 
-  # Symlink for ease of use
-  install -dm755 "$pkgdir"/usr/bin
-  ln -s /usr/lib/$pkgname/zulip "$pkgdir"/usr/bin/zulip
+  cd $pkgname-$pkgver
+
+  install -dm 755 "$pkgdir"/usr/{lib,bin}
+  cp -a dist/linux-unpacked "$pkgdir"/usr/lib/$pkgname
+  ln -s /usr/lib/$pkgname/zulip "$pkgdir"/usr/bin
+
+  for i in 16 24 32 48 64 96 128 256 512; do
+    install -Dm 644 build/icons/${i}x${i}.png \
+      "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/zulip.png
+  done
+
+  install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/zulip-desktop
 }
diff --git a/zulip.desktop b/zulip.desktop
new file mode 100644
index 000000000000..fb5f18bc784d
--- /dev/null
+++ b/zulip.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Zulip
+Comment=Real-time team chat based on the email threading model
+Exec=zulip
+Icon=zulip
+Categories=Network;InstantMessaging;
+Terminal=false