uodate to 3.32.3079.r59.ga4e2f8ac

4 files changed, 40 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4934c4820d82..5d0cfb249a7a 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,24 @@
 pkgbase = wire-desktop-git
 	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
-	pkgver = 3.11.3259.r488.g38cb57bd
+	pkgver = 3.32.3079.r59.ga4e2f8ac
 	pkgrel = 1
 	url = https://wire.com/
 	arch = any
 	license = GPL3
 	makedepends = git
-	makedepends = npm
+	makedepends = npm>=6.14.18
+	makedepends = nodejs>=14.21.3
 	makedepends = yarn
-	depends = electron6
+	makedepends = gendesk
+	depends = bash
+	depends = electron26
 	depends = xdg-utils
 	optdepends = emoji-font: colorful emoji
 	provides = wire-desktop
 	conflicts = wire-desktop
-	source = git+https://github.com/wireapp/wire-desktop.git
-	source = wire-desktop.desktop
+	source = wire-desktop.git::git+https://github.com/wireapp/wire-desktop.git
+	source = wire-desktop.sh
 	sha256sums = SKIP
-	sha256sums = 53f37e99d4c2f41a3e31fd70154d82ba06a4af578c68df86af4906f7f37ec787
+	sha256sums = f472bd72db26cb19739dd463ec75ff69bacab3f367d887ce2da170ff12148b4f
 
 pkgname = wire-desktop-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 306a285a84d8..9a2d6d4a4d21 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,39 @@
-# Maintainer: Conor Anderson <conor@conr.ca>
-# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
-
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Contributor: Conor Anderson <conor@conr.ca>
+# Contributor: Maxim Baz <$pkgname at maximbaz dot com>
 pkgname=wire-desktop-git
-_pkgname=${pkgname%-git}
-pkgver=3.11.3259.r488.g38cb57bd
+pkgver=3.32.3079.r59.ga4e2f8ac
 pkgrel=1
 pkgdesc='End-to-end encrypted messenger with file sharing, voice calls and video conferences'
 arch=('any')
-url='https://wire.com/'
+url="https://wire.com/"
+_githuburl="https://github.com/wireapp/wire-desktop"
 license=('GPL3')
-provides=('wire-desktop')
-conflicts=('wire-desktop')
-depends=('electron6' 'xdg-utils')
-makedepends=('git' 'npm' 'yarn')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+depends=('bash' 'electron26' 'xdg-utils')
+makedepends=('git' 'npm>=6.14.18' 'nodejs>=14.21.3' 'yarn' 'gendesk')
 optdepends=('emoji-font: colorful emoji')
-source=("git+https://github.com/wireapp/wire-desktop.git"
-        "${_pkgname}.desktop")
+source=("${pkgname%-git}.git::git+${_githuburl}.git"
+        "${pkgname%-git}.sh")
 sha256sums=('SKIP'
-            '53f37e99d4c2f41a3e31fd70154d82ba06a4af578c68df86af4906f7f37ec787')
-
+            'f472bd72db26cb19739dd463ec75ff69bacab3f367d887ce2da170ff12148b4f')
 pkgver() {
-    cd "${_pkgname}"
+    cd "${srcdir}/${pkgname%-git}.git"
     git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
-
 prepare() {
-    # Create launcher script
-    cat << EOF > "${_pkgname}-launcher"
-#!/usr/bin/env sh
-
-electron6 "/usr/lib/${_pkgname}" "\$@"
-EOF
+    gendesk -q -f -n --categories "Network" --name "${pkgname%-git}" --exec "${pkgname%-git}"
 }
-
 build() {
-    cd "${_pkgname}"
+    cd "${srcdir}/${pkgname%-git}.git"
     yarn
-    BUILD_NUMBER="$(echo ${pkgver} | cut -d. -f3)" LINUX_TARGET=dir ENABLE_ASAR=false yarn build:linux
+    yarn build:linux:internal
 }
-
 package() {
-    # Place files
-    install -d "${pkgdir}/usr/lib/${_pkgname}"
-    cp -a "${_pkgname}/wrap/dist/linux-unpacked/resources/app/"{electron,node_modules,package.json} "${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/" "${_pkgname}.desktop"
-    local res
-    for res in 32x32 256x256; do
-        install -Dm644 "${_pkgname}/resources/icons/${res}.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/${_pkgname}.png"
-    done
-}
-
-# vim:set ts=4 sw=4 et:
+    install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/${pkgname%-git}.git/wrap/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-git}/resources"
+    install -Dm644 "${srcdir}/${pkgname%-git}.git/resources/icons/256x256.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
+    install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/${pkgname%-git}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/wire-desktop.desktop b/wire-desktop.desktop
deleted file mode 100644
index 768e81b9ab59..000000000000
--- a/wire-desktop.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Wire
-Comment=The most secure collaboration platform.
-Exec=wire-desktop %U
-Terminal=false
-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
diff --git a/wire-desktop.sh b/wire-desktop.sh
new file mode 100644
index 000000000000..694ff41fca1d
--- /dev/null
+++ b/wire-desktop.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron26
+_ASAR="/opt/wire-desktop/resources/app.asar"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+fi
\ No newline at end of file