Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

riot-desktop: update to 1.6.0. #21708

Merged
merged 1 commit into from May 10, 2020
Merged

Conversation

ProjectMoon
Copy link
Contributor

@ProjectMoon ProjectMoon commented May 6, 2020

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.

@dawidpotocki
Copy link
Contributor

dawidpotocki commented May 7, 2020

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

  1. Riot icon should be changed to one without text

  2. 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.

@ProjectMoon
Copy link
Contributor Author

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.

@ProjectMoon
Copy link
Contributor Author

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?

@dawidpotocki
Copy link
Contributor

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.

@ProjectMoon
Copy link
Contributor Author

I didn't know that.

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

@dawidpotocki
Copy link
Contributor

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"

@ProjectMoon
Copy link
Contributor Author

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

srcpkgs/riot-desktop/template Outdated Show resolved Hide resolved
srcpkgs/riot-desktop/template Outdated Show resolved Hide resolved
srcpkgs/riot-desktop/template Outdated Show resolved Hide resolved
@dawidpotocki
Copy link
Contributor

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

Idk, but it works now, so whatever.

@ericonr
Copy link
Member

ericonr commented May 7, 2020

Encrypted room search working for me :D

@ProjectMoon ProjectMoon force-pushed the master branch 2 times, most recently from 910612a to d6fa20e Compare May 8, 2020 20:54
srcpkgs/riot-desktop/template Outdated Show resolved Hide resolved
@dawidpotocki
Copy link
Contributor

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.

@ProjectMoon
Copy link
Contributor Author

It was added in 24ea9af46f9, which was the update to Riot 0.17.9. Seems like it was just added. PR here I think: #8585

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

Copy link
Contributor

@dawidpotocki dawidpotocki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welp, I think that's good to merge.

@Johnnynator Johnnynator merged commit dc440ac into void-linux:master May 10, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 5, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants