wire-desktop-git: align with wire-desktop-beta

3 files changed, 33 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f380fa7d839..bbfa0d26c483 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = wire-desktop-git
 	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
-	pkgver = 3.6.2885.r21.gf880ee4a
+	pkgver = 3.6.2885.r28.ge60eae3c
 	pkgrel = 1
 	url = https://wire.com/
 	arch = x86_64
 	license = GPL3
-	makedepends = cargo
-	makedepends = npm
-	makedepends = python2
 	makedepends = git
+	makedepends = npm
 	makedepends = yarn
 	depends = electron
 	depends = xdg-utils
@@ -18,7 +16,7 @@ pkgbase = wire-desktop-git
 	source = git+https://github.com/wireapp/wire-desktop.git
 	source = wire-desktop.desktop
 	sha256sums = SKIP
-	sha256sums = cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea
+	sha256sums = 53f37e99d4c2f41a3e31fd70154d82ba06a4af578c68df86af4906f7f37ec787
 
 pkgname = wire-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 80731b76d201..bc3bc4fd2e14 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
 
 pkgname=wire-desktop-git
-_name=${pkgname%-git}
-pkgver=3.6.2885.r21.gf880ee4a
+_pkgname=${pkgname%-git}
+pkgver=3.6.2885.r28.ge60eae3c
 pkgrel=1
 pkgdesc='End-to-end encrypted messenger with file sharing, voice calls and video conferences'
 arch=('x86_64')
@@ -12,49 +12,53 @@ license=('GPL3')
 provides=('wire-desktop')
 conflicts=('wire-desktop')
 depends=('electron' 'xdg-utils')
-makedepends=('cargo' 'npm' 'python2' 'git' 'yarn')
+makedepends=('git' 'npm' 'yarn')
 optdepends=('emoji-font: colorful emoji')
 source=("git+https://github.com/wireapp/wire-desktop.git"
-        "${_name}.desktop")
+        "${_pkgname}.desktop")
 sha256sums=('SKIP'
-            'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea')
+            '53f37e99d4c2f41a3e31fd70154d82ba06a4af578c68df86af4906f7f37ec787')
 
 pkgver() {
-    cd "${_name}"
+    cd "${_pkgname}"
     git describe --tags | sed 's/linux\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
     # Remove "node-addressbook" dependency as it's only for macOS
-    sed -i '/node-addressbook/d' "${_name}/electron/package.json"
+    sed -i '/node-addressbook/d' "${_pkgname}/electron/package.json"
 
     # Create launcher script
-    cat << EOF > "${_name}-launcher"
-#!/bin/sh
+    cat << EOF > "${_pkgname}-launcher"
+#!/usr/bin/env sh
 
-electron "/usr/lib/${_name}" "\$@"
+electron "/usr/lib/${_pkgname}" "\$@"
 EOF
 }
 
 build() {
-    cd "${_name}"
+    cd "${_pkgname}"
     yarn
     yarn build:ts
-    npx grunt 'clean:linux' 'update-keys' 'gitinfo' 'release-prod' 'bundle'
+    # **********
+    # ***TODO*** in the next release simply use 'linux-prod-package'
+    npx grunt 'clean:linux' 'update-keys' 'gitinfo'  'set-custom-data' 'release-prod' 'bundle'
 }
 
 package() {
     # Place files
-    install -d "${pkgdir}/usr/lib/${_name}"
-    cp -a "${_name}/electron"/* "${pkgdir}/usr/lib/${_name}"
+    install -d "${pkgdir}/usr/lib/${_pkgname}"
+    cp -a "${_pkgname}/electron/"* "${pkgdir}/usr/lib/${_pkgname}"
 
     # Place launcher script
-    install -Dm755 "${_name}-launcher" "${pkgdir}/usr/bin/${_name}"
+    install -Dm755 "${_pkgname}-launcher" "${pkgdir}/usr/bin/${_pkgname}"
 
     # Place desktop entry and icon
-    desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${_name}.desktop"
+    desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${_pkgname}.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"
+        install -Dm644 "${_pkgname}/resources/icons/${res}.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${_pkgname}.png"
     done
 }
+
+# vim:set ts=4 sw=4 et:
diff --git a/wire-desktop.desktop b/wire-desktop.desktop
index e9fdcbb4bf10..768e81b9ab59 100644
--- a/wire-desktop.desktop
+++ b/wire-desktop.desktop
@@ -1,12 +1,13 @@
 [Desktop Entry]
-Type=Application
-Version=1.1
 Name=Wire
-GenericName=Secure messenger
-Comment=Secure messenger for everyone
-Exec=wire-desktop
-Icon=wire-desktop
+Comment=The most secure collaboration platform.
+Exec=wire-desktop %U
 Terminal=false
-Categories=Network;InstantMessaging;Chat;VideoConference
-Keywords=chat;encrypt;e2e;messenger;videocall
+Type=Application
+Icon=wire-desktop
 StartupWMClass=Wire
+Categories=Network;
+GenericName=Secure messenger
+Keywords=chat;encrypt;e2e;messenger;videocall
+MimeType=x-scheme-handler/wire
+Version=1.1