[PR PATCH] riot-desktop: update to 1.6.0.

[PR PATCH] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy).

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

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

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

From bf42efe25ee3837e08c3950918b0abe1a824f52e Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 52 ++++++++++++++---------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..7320e0d9158 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.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
-wrksrc="riot-web-${version}"
+wrksrc="riot-desktop-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
+hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl tar gnupg"
 depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333"
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
@@ -22,44 +22,32 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
 	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
 	yarn install
-
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	yarn run fetch --importkey
+	yarn run fetch --cfgdir 'riot.im/release/' "v${version}"
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy dist/linux-unpacked/* /usr/lib/riot-desktop
+	# not sure this actually does anything at the moment.
+	# it seems the build packs the config directly.
+	vinstall riot.im/release/config.json 664 /etc/riot-desktop/ config.json
+	#ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall deploys/riot-v${version}/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
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

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

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

From dec9634dd54b86fa01749af6e7a1f737cddf02ce Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 54 ++++++++++++++---------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..e66922ad545 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.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
-wrksrc="riot-web-${version}"
+wrksrc="riot-desktop-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl tar gnupg"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333"
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
@@ -22,44 +22,32 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
 	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
 	yarn install
-
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	yarn run fetch --importkey
+	yarn run fetch --cfgdir 'riot.im/release/' "v${version}"
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy dist/linux-unpacked/* /usr/lib/riot-desktop
+	# not sure this actually does anything at the moment.
+	# it seems the build packs the config directly.
+	vinstall riot.im/release/config.json 664 /etc/riot-desktop/ config.json
+	#ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall deploys/riot-v${version}/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
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625053088

Comment:
I was doing myself riot-desktop update to 1.6.0 and have all following issues fixed, so you can copy-paste my work, do it yourself, or just let me create a PR.

1. Please don't download precompiled riot-web package, instead use `distfiles` for `riot-web` and compile with `yarn build`.

2. > `=> WARNING: riot-desktop-1.6.0_1: libGLVESv2.so not found in common/shlibs!`

Also you should see this error at the end of a build log, I don't know what this file is for (and couldn't find any information online), but it doesn't exist anywhere in a build. The only similar thing I found is libGLESv2.so

3. Riot icon should be changed to one without text

4. Message search still isn't working (at least for me)

> Message search
> Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with search components added.

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625053088

Comment:
I was doing myself riot-desktop update to 1.6.0 (https://github.com/dawidpotocki/void-packages/tree/riot-desktop-1.6.0) and have all following issues fixed, so you can copy-paste my work, do it yourself, or just let me create a PR.

1. Please don't download precompiled riot-web package, instead use `distfiles` for `riot-web` and compile with `yarn build`.

2. > `=> WARNING: riot-desktop-1.6.0_1: libGLVESv2.so not found in common/shlibs!`

Also you should see this error at the end of a build log, I don't know what this file is for (and couldn't find any information online), but it doesn't exist anywhere in a build. The only similar thing I found is libGLESv2.so

3. Riot icon should be changed to one without text

4. Message search still isn't working (at least for me)

> Message search
> Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with search components added.

Re: riot-desktop: update to 1.6.0.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625125027

Comment:
So, the yarn script to fetch riot-web is not actually a precompiled binary. It does build locally. However, I agree that it should not fetch with yarn. The way you are currently doing it does not exactly mirror the build script (scripts/fetch-package.js in riot-desktop repo). The script packs riot-web and sticks it in `deploys/` directory of riot-desktop.

I am trying to run your version of the build locally to see what the issues is with E2E room searching.

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From 47ca1950046dcc5b9a23aac07608455ec980f9a6 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 57 +++++++++++++++--------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..270449362ee 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,18 +1,19 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
+#wrksrc="riot-desktop-${version}"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs python rust cargo python sqlcipher-devel curl tar gnupg"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
@@ -22,44 +23,36 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	# Disable auto-updating.
+	cd ../riot-desktop-${version}
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vinstall config.sample.json 644 /etc/riot-desktop/ config.json
+	vcopy webapp /usr/lib/riot-desktop/resources
+	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: riot-desktop: update to 1.6.0.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625130302

Comment:
Ok, so newly pushed version has your alterations for building of the package and the do_install function. I am still able to search my encrypted rooms. So maybe there is a runtime dependency I have installed that is missing from the XBPS template?

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625142897

Comment:
> I am trying to run your version of the build locally to see what the issues is with E2E room searching.

I meant with your `template`, but nevermind.

> So, the yarn script to fetch riot-web is not actually a precompiled binary.

It does ship precompiled binaries, like a WASM olm library.

Re: riot-desktop: update to 1.6.0.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625145682

Comment:
I didn't know that.

Does encrypted room search work using the current version of the template in this PR?

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625146542

Comment:
> Does encrypted room search work using the current version of the template in this PR?

Yes.

And you still didn't change that line:

```
 shlib_provides="libGLVESv2.so"
```

Re: riot-desktop: update to 1.6.0.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625148653

Comment:
And encrypted room search is working on your template, right? What is the difference between the two?

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625151666

Comment:
> And encrypted room search is working on your template, right? What is the difference between the two?

Idk, but it works now, so whatever.

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From 9bb1a9804a40d46da952937e611d6d77ae72e690 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 56 +++++++++++++++--------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..20eee69decb 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.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs python rust cargo sqlcipher-devel curl"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
@@ -22,44 +22,36 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	cd ../riot-desktop-${version}
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vinstall config.sample.json 644 /etc/riot-desktop/ config.json
+	vcopy webapp /usr/lib/riot-desktop/resources
+	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From 796c248310dcb6dd362aad59ceb0aa0c756cb32d Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 57 +++++++++++++++--------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..81d89739b76 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,65 +1,56 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs python rust cargo sqlcipher-devel curl"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20:   390 Segmentation fault" ;;
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	cd ../riot-desktop-${version}
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vinstall config.sample.json 644 /etc/riot-desktop/ config.json
+	vcopy webapp /usr/lib/riot-desktop/resources
+	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: riot-desktop: update to 1.6.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-625475345

Comment:
Encrypted room search working for me :D 

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From 910612a920af6e575a0fd5d702fa9d8c5e4f4eaa Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 59 ++++++++++++++---------------------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..bbbc5629405 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,65 +1,54 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
-conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs python rust cargo sqlcipher-devel curl"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20:   390 Segmentation fault" ;;
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	cd ../riot-desktop-${version}
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
-	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vcopy webapp /usr/lib/riot-desktop/resources
+
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From d6fa20efb69e6114b35d38f02a250c4ec5096129 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 59 +++++++++++++++--------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..6e202d318a1 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,65 +1,58 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs python rust cargo sqlcipher-devel curl"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20:   390 Segmentation fault" ;;
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	cd ../riot-desktop-${version}
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vinstall config.sample.json 644 /etc/riot-desktop/ config.json
+	vcopy webapp /usr/lib/riot-desktop/resources
+	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: [PR PATCH] [Updated] riot-desktop: update to 1.6.0.

[ProjectMoon]

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

There is an updated pull request by ProjectMoon against master on the void-packages repository

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/21708

riot-desktop: update to 1.6.0.
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.

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

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

From 20fdb06749fcb03d65be4044ebd3ceea2f859d32 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 5 May 2020 21:14:34 +0000
Subject: [PATCH] riot-desktop: update to 1.6.0.

---
 srcpkgs/riot-desktop/template | 59 +++++++++++++++--------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 0b68ebbff5a..a2664b7bd51 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,65 +1,58 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.5.15
+version=1.6.0
 revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl"
-depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
+hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel"
+depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy sqlcipher"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://riot.im"
-distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum="3d5512f842fa436aef00b1b1f1c5ced4a4f1adc5cc1bcfddbc77573387f9cc42"
+distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
+checksum="4b1befbabb1fc391d0a9a49125540903fa97d5bbad033bdaff377a018a244333 0e54adbda71e2d572f1ecdec3a6f07cb6379e5c9f8223bff19580d2e663f50c4"
 nocross=yes
 nostrip=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20:   390 Segmentation fault" ;;
 esac
 
 pre_build() {
-	# This section is borrowed from the Arch PKGBUILD
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	# Build dependencies for riot-web
 	yarn install
 
-	# Add the matrix-seshat package (which is needed for search in E2E encrypted
-	# rooms) as well as the electron-build-env package, which gets used later to
-	# rebuild the native libraries against electron’s version of node.
-	# See here for more information:
-	# https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
-	cd electron_app
-	yarn add matrix-seshat
-	yarn add electron-build-env
-	# Finally also enable the event indexing feature in the config.
-	sed -i 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+	# Build dependencies and alterations for riot-desktop
+	cd ../riot-desktop-${version}
+	# Disable auto-updating.
+	sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	yarn install
 }
 
 do_build() {
-	# This is also borrowed from the Arch PKGBUILD
-	cd electron_app
-	# Recompile matrix-seshat
-	yarn run electron-build-env -- --electron 7 neon build matrix-seshat --release
-	cd ..
-	# Do the actual build
-	yarn build:electron:linux
+	yarn build
+	cd ../riot-desktop-${version}
+	yarn run build:native
+	yarn run build
 }
 
 do_install() {
 	vmkdir usr/lib/riot-desktop
 	vmkdir etc/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/resources/webapp
+	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
+	vinstall config.sample.json 644 /etc/riot-desktop/ config.json
+	vcopy webapp /usr/lib/riot-desktop/resources
+	ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+
 	vmkdir usr/bin
-	ln -s /usr/lib/riot-desktop/riot-web $DESTDIR/usr/bin/riot-desktop
+	ln -s /usr/lib/riot-desktop/riot-desktop $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
+	vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall electron_app/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
+		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ riot.png
 	done
 }

Re: riot-desktop: update to 1.6.0.

[dawidpotocki]

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

New comment by dawidpotocki on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-626172878

Comment:
It looks fine to me, but still not sure about `shlib_provides`, so if some Void Linux member could answer that, it would be nice.

Re: riot-desktop: update to 1.6.0.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21708#issuecomment-626192356

Comment:
It was added in `24ea9af46f9`, which was the update to Riot 0.17.9. Seems like it was just added. PR here I think: https://github.com/void-linux/void-packages/pull/8585

Cannot find any specific reason it was added. It seems to work without the shlib.

Re: [PR PATCH] [Merged]: riot-desktop: update to 1.6.0.

[Johnnynator]

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

There's a merged pull request on the void-packages repository

riot-desktop: update to 1.6.0.
https://github.com/void-linux/void-packages/pull/21708

Description:
Riot 1.6.0 came out ~2 days ago. This is a build for 1.6.0 following the new instructions posted here: https://github.com/vector-im/riot-desktop. This build also fixes the encrypted room search (version 1.5.15 has a syntax error in the build I think).

I am not exactly happy about this build downloading riot's source via yarn, although it does at least verify it with GPG. It uses a NodeJS script in the distfile to acquire riot-web's code for building. I would like a suggestion on how to improve this (unless it's okay by the Void maintainers, in which case, let's go crazy). It should be noted that the Riot developers plan to support fetching from arbitrary URLs in the future, but right now the script is required to download the riot-web source.

I think I will at least try to move the key and signature files to XBPS distfiles instead of letting yarn fetch them.

Edit: ^ having XBPS download the key files didn't really work.