riot-desktop: update to 1.4.2

- Adjust template.
- Delete patch only needed for electron5-incompatible versions.
  -> See vector-im/riot-web#10392

Signed-off-by: Bendodroid <bendodroid@icloud.com>
This commit is contained in:
Bendodroid 2019-10-04 15:11:26 +02:00 committed by Helmut Pozimski
parent ed7480edc7
commit 6617e7fc9e
2 changed files with 4 additions and 36 deletions

View file

@ -1,32 +0,0 @@
from https://gist.github.com/dbkr/e898624be6d53590ebf494521d868fec
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 99ddfbd1..c3aa4f5d 100644
--- electron_app/src/electron-main.js
+++ electron_app/src/electron-main.js
@@ -206,7 +206,10 @@ const launcher = new AutoLaunch({
// work.
// Also mark it as secure (ie. accessing resources from this
// protocol and HTTPS won't trigger mixed content warnings).
-protocol.registerStandardSchemes(['vector'], {secure: true});
+//protocol.registerStandardSchemes(['vector'], {secure: true});
+protocol.registerSchemesAsPrivileged([{
+ scheme: 'vector', privileges: {standard: true, secure: true, supportFetchAPI: true},
+}]);
app.on('ready', () => {
if (argv['devtools']) {
diff --git a/electron_app/src/preload.js b/electron_app/src/preload.js
index 3a4f7c9a..f63e19d4 100644
--- electron_app/src/preload.js
+++ electron_app/src/preload.js
@@ -23,7 +23,7 @@ window.ipcRenderer = ipcRenderer;
// protocol: this is necessary to load olm.wasm.
// (Also mark it a secure although we've already
// done this in the main process).
-webFrame.registerURLSchemeAsPrivileged('vector', {
+/*webFrame.registerURLSchemeAsPrivileged('vector', {
secure: true,
supportFetchAPI: true,
-});
+});*/

View file

@ -1,18 +1,18 @@
# Template file for 'riot-desktop'
pkgname=riot-desktop
version=1.2.1
revision=2
version=1.4.2
revision=1
archs="i686 x86_64"
wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git nodejs yarn"
depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="zethra <jediben97@gmail.com>"
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=7519083fcf579bf79bd5e0e5665bad43b89432a215f677fa00d8a115a34fdf08
checksum=0d8ce20912ea8c6961ff04a3e3231da1f77ec18cfdc5000a1f01d19eec9ad51c
nocross=yes
nostrip=yes
shlib_provides="libGLVESv2.so"