[PR PATCH] riot-desktop: update to 1.5.7

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is a new pull request by Pestdoktor against master on the void-packages repository

https://github.com/Pestdoktor/void-packages riot-desktop
https://github.com/void-linux/void-packages/pull/18334

riot-desktop: update to 1.5.7


A patch file from https://github.com/void-linux/void-packages/pull/18334.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-riot-desktop-18334.patch --]
[-- Type: text/x-diff, Size: 3116 bytes --]

From 82d3c8f3442f071e657ff58f3e486115091258bd Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Fri, 10 Jan 2020 19:46:18 +0100
Subject: [PATCH] riot-desktop: update to 1.5.7

---
 srcpkgs/riot-desktop/files/riot-desktop.sh |  2 --
 srcpkgs/riot-desktop/template              | 28 ++++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/riot-desktop/files/riot-desktop.sh

diff --git a/srcpkgs/riot-desktop/files/riot-desktop.sh b/srcpkgs/riot-desktop/files/riot-desktop.sh
deleted file mode 100644
index e997d4e5ced..00000000000
--- a/srcpkgs/riot-desktop/files/riot-desktop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/riot-desktop/dist/electron /usr/lib/riot-desktop/electron_app "$@"
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 8c681f5ec31..ff617f6a342 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,18 +1,18 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.6
+version=1.5.7
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git nodejs yarn"
+hostmakedepends="git yarn"
 depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
 short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Bendodroid <bendodroid@icloud.com>"
 license="Apache-2.0"
 homepage="https://riot.im"
 distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum=81716845e53cca31ce3dc6ed42640ec56279b9171db2709e3f6f81b93c415a6a
+checksum=c11436a2fb77a3b9edc46053c4de6886a4652020e1220780a2c8863edecf5992
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
@@ -21,23 +21,27 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20:   390 Segmentation fault" ;;
 esac
 
+pre_build() {
+	vsed -i package.json -e 's|-l --x64|-l --x64 --dir|'
+	yarn install --ignore-scripts
+	cd node_modules/matrix-js-sdk
+	yarn install --ignore-scripts
+	cd ../matrix-react-sdk
+	yarn install --ignore-scripts
+}
+
 do_build() {
-	npm install
-	npm run build
-	npm install electron
-	npm run install:electron
+	yarn build:electron:linux
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/riot-desktop
-	vcopy node_modules/electron/dist /usr/lib/riot-desktop/
-	vcopy electron_app /usr/lib/riot-desktop/
-	vcopy webapp /usr/lib/riot-desktop
-	vcopy origin_migrator /usr/lib/riot-desktop
+	vcopy electron_app/dist/linux-unpacked/* /usr/lib/riot-desktop
 	vinstall config.sample.json 664 /etc/riot-desktop/ config.json
 	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/config.json
-	vbin ${FILESDIR}/riot-desktop.sh riot-desktop
+	vmkdir usr/bin
+	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
 	vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
 	vinstall res/themes/riot/img/logos/riot-im-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
 	for i in 16 24 48 64 96 128 256 512; do