From cd152d164282687260d850df1bab80808b070050 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 23 Aug 2020 17:18:50 +0200 Subject: [PATCH] element-desktop: use system electron9 [ci skip] --- common/shlibs | 1 - srcpkgs/element-desktop/files/element-desktop | 2 ++ srcpkgs/element-desktop/template | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/element-desktop/files/element-desktop diff --git a/common/shlibs b/common/shlibs index 4644dac1d1c..d9fba22d620 100644 --- a/common/shlibs +++ b/common/shlibs @@ -123,7 +123,6 @@ libGLESv2.so atom-1.41.0_1 libGLESv2.so opera-55.0.2994.37_2 libGLESv2.so discord-0.0.7_1 libGLESv2.so keybase-desktop-3.1.2_1 -libGLESv2.so riot-desktop-0.17.9_2 libGLESv2.so wire-desktop-3.6.2885_1 libGLESv2.so Signal-Desktop-1.23.2_1 libGLESv2.so slack-desktop-3.4.2_1 diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop new file mode 100644 index 00000000000..d16e825046c --- /dev/null +++ b/srcpkgs/element-desktop/files/element-desktop @@ -0,0 +1,2 @@ +#!/bin/sh +exec electron9 /usr/lib/element-desktop/resources/app.asar "$@" diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template index 97989901885..71816d51321 100644 --- a/srcpkgs/element-desktop/template +++ b/srcpkgs/element-desktop/template @@ -1,13 +1,12 @@ # Template file for 'element-desktop' pkgname=element-desktop version=1.7.4 -revision=1 -archs="x86_64" +revision=2 wrksrc="element-web-${version}" conf_files="/etc/${pkgname}/config.json" hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config" makedepends="libsecret-devel" -depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher" +depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher electron9" short_desc="Glossy Matrix collaboration client, desktop version" maintainer="projectmoon " license="Apache-2.0" @@ -16,7 +15,6 @@ distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar. checksum="e9f5855e432841aa503f3a2e85073c466992e1a28b697b21cb370485c6c4aa35 96b38a348bc7ba1530171aa730f8a02a469fb5e57e524034ebd2768ed21f1c97" nocross=yes -nostrip=yes pre_build() { # Build dependencies for riot-web @@ -40,14 +38,16 @@ do_build() { do_install() { vmkdir usr/lib/element-desktop vmkdir etc/element-desktop - vcopy ../element-desktop-${version}/dist/linux-unpacked/* /usr/lib/element-desktop + case "$XBPS_TARGET_MACHINE" in + i686*) vcopy ../element-desktop-${version}/dist/linux-ia32-unpacked/resources /usr/lib/element-desktop/resources;; + *) vcopy ../element-desktop-${version}/dist/linux-unpacked/resources /usr/lib/element-desktop/resources + esac vinstall config.sample.json 644 /etc/element-desktop/ config.json vcopy webapp /usr/lib/element-desktop/resources ln -s /etc/element-desktop/config.json $DESTDIR/usr/lib/element-desktop/resources/webapp/config.json - vmkdir usr/bin - ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop - ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/riot-desktop + vbin ${FILESDIR}/element-desktop + ln -s element-desktop $DESTDIR/usr/bin/riot-desktop vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element.svg