Update wire-desktop-beta and -git, -beta doesn't conflict with wire-desktop (#3)

2 files changed, 43 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f1b7f15996f..2a1c81417593 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,22 @@
 pkgbase = wire-desktop-git
-	pkgdesc = Modern, private messenger
-	pkgver = 3.4.2879.r6.gd0abc63f
+	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
+	pkgver = 3.5.2881.r14.g2b7ce57f
 	pkgrel = 1
 	url = https://wire.com/
 	arch = x86_64
-	arch = i686
 	license = GPL3
 	makedepends = cargo
 	makedepends = npm
 	makedepends = python2
+	makedepends = git
 	makedepends = yarn
-	depends = alsa-lib
-	depends = gconf
-	depends = gtk2
-	depends = libxss
-	depends = libxtst
-	depends = nss
+	depends = electron
 	depends = xdg-utils
-	optdepends = hunspell-en: for English spellcheck support
-	optdepends = noto-fonts-emoji: for colorful emoji made by Google
-	optdepends = ttf-emojione: for colorful emoji made by EmojiOne
+	optdepends = hunspell-en_US: for English spellcheck support
+	optdepends = emoji-font: colorful emoji
 	provides = wire-desktop
-	conflicts = wire-desktop-bin
 	conflicts = wire-desktop
-	source = git://github.com/wireapp/wire-desktop.git
+	source = git+https://github.com/wireapp/wire-desktop.git
 	source = wire-desktop.desktop
 	sha256sums = SKIP
 	sha256sums = cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea
diff --git a/PKGBUILD b/PKGBUILD
index 02f81a0fb5c9..eea261f50955 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,41 @@
 # Maintainer: Conor Anderson <conor@conr.ca>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+
 pkgname=wire-desktop-git
 _pkgname=${pkgname%-git}
-pkgver=3.4.2879.r6.gd0abc63f
+pkgver=3.5.2881.r14.g2b7ce57f
 pkgrel=1
-pkgdesc='Modern, private messenger'
-arch=('x86_64' 'i686')
+pkgdesc='End-to-end encrypted messenger with file sharing, voice calls and video conferences'
+arch=('x86_64')
 url='https://wire.com/'
 license=('GPL3')
-conflicts=('wire-desktop-bin' 'wire-desktop')
-depends=('alsa-lib' 'gconf' 'gtk2' 'libxss' 'libxtst' 'nss' 'xdg-utils')
-makedepends=('cargo' 'npm' 'python2' 'yarn')
-optdepends=('hunspell-en: for English spellcheck support'
-            'noto-fonts-emoji: for colorful emoji made by Google'
-            'ttf-emojione: for colorful emoji made by EmojiOne')
 provides=('wire-desktop')
-source=("git://github.com/wireapp/wire-desktop.git"
-        "wire-desktop.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')
+source=("git+https://github.com/wireapp/wire-desktop.git"
+        "${_pkgname}.desktop")
 sha256sums=('SKIP'
             'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  git describe --tags | sed 's/release\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${_pkgname}"
+  git describe --tags | sed 's/linux\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  # Create launcher script
+  cat << EOF > "${_pkgname}-launcher"
+#!/bin/sh
+
+electron "/usr/lib/${_pkgname}"
+EOF
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${_pkgname}"
   yarn
   yarn build:ts
   npx grunt 'linux-other'
@@ -34,27 +44,25 @@ build() {
 package() {
   # Place files
   install -d "${pkgdir}/usr/lib/${_pkgname}"
-  cp -a "${srcdir}/${_pkgname}"/wrap/dist/linux*unpacked/* "${pkgdir}/usr/lib/${_pkgname}"
-  
-  # Symlink main binary
-  install -d "${pkgdir}/usr/bin"
-  ln -s "/usr/lib/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
-  
+  cp -a "${_pkgname}"/wrap/dist/linux-unpacked/resources/app/* "${pkgdir}/usr/lib/${_pkgname}"
+
+  # Place launcher script
+  install -Dm755 "${_pkgname}-launcher" "${pkgdir}/usr/bin/${_pkgname}"
+
   # Place desktop entry and icon
-  desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${srcdir}/${_pkgname}.desktop"
+  desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${_pkgname}.desktop"
+  local res
   for res in 32x32 256x256; do
-    install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
-    install -Dm644 "${srcdir}/${_pkgname}/resources/icons/${res}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${_pkgname}.png"
+    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}/resources/app/node_modules/spellchecker/vendor/hunspell_dictionaries"
-  ln -s "/usr/share/hunspell" "${pkgdir}/usr/lib/${_pkgname}/resources/app/node_modules/spellchecker/vendor/hunspell_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 license files
+  local license
   for license in "LICENSE.electron.txt" "LICENSES.chromium.html"; do
-    install -Dm644 "${pkgdir}/usr/lib/${_pkgname}/${license}" "${pkgdir}/usr/share/licenses/${_pkgname}/${license}"
-    rm "${pkgdir}/usr/lib/${_pkgname}/${license}"
+    install -Dm644 "${_pkgname}/wrap/dist/linux-unpacked/${license}" "${pkgdir}/usr/share/licenses/${_pkgname}/${license}"
   done
 }