From 87722508a36412c80ab21b67bc018d98d8a18d4e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 6 Apr 2021 19:08:31 +0200 Subject: [PATCH] wire-desktop: use System electron --- srcpkgs/wire-desktop/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template index edb4bb21be61..853d61213296 100644 --- a/srcpkgs/wire-desktop/template +++ b/srcpkgs/wire-desktop/template @@ -1,9 +1,10 @@ # Template file for 'wire-desktop' pkgname=wire-desktop version=3.24.2939 -revision=1 +revision=2 wrksrc="${pkgname}-linux-${version}" hostmakedepends="nodejs yarn git" +depends="electron10" short_desc="Wire for desktop" maintainer="Young Jin Park " license="GPL-3.0-or-later" @@ -13,9 +14,7 @@ checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127 nocross=yes case "$XBPS_TARGET_MACHINE" in - *-musl) broken="glibc artefacts are installed" ;; - i686*) broken="yarn" ;; - ppc*) broken="electron" ;; + *-musl) broken="Electron on musl is unreliable" ;; esac pre_build() { @@ -28,9 +27,13 @@ do_build() { do_install() { vmkdir usr/lib/wire-desktop - vcopy wrap/dist/linux-unpacked/* usr/lib/wire-desktop + vinstall wrap/dist/linux-unpacked/resources/app.asar 644 usr/lib/wire-desktop vmkdir usr/bin - ln -sf /usr/lib/wire-desktop/wire-desktop ${DESTDIR}/usr/bin/ + cat << EOF > "wire-desktop.sh" +#!/usr/bin/env sh +electron10 "/usr/lib/wire-desktop/app.asar" "\$@" +EOF + vbin wire-desktop.sh wire-desktop vmkdir usr/share/icons/hicolor/256x256/apps vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png vmkdir usr/share/icons/hicolor/32x32/apps