Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] riot-desktop: add patch for startup failure due to electron 5
Date: Tue, 18 Jun 2019 12:16:27 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12527@inbox.vuxu.org> (raw)

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

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

https://github.com/Hoshpak/void-packages riot-desktop-12513
https://github.com/void-linux/void-packages/pull/12527

riot-desktop: add patch for startup failure due to electron 5
fixes #12513

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

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

From a9e9f7ac34d28e19205a2c51435c17dcde0ea069 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 18 Jun 2019 12:15:09 +0200
Subject: [PATCH] riot-desktop: add patch for startup failure due to electron 5

fixes #12513
---
 srcpkgs/riot-desktop/patches/electron5.patch | 32 ++++++++++++++++++++
 srcpkgs/riot-desktop/template                |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/riot-desktop/patches/electron5.patch

diff --git a/srcpkgs/riot-desktop/patches/electron5.patch b/srcpkgs/riot-desktop/patches/electron5.patch
new file mode 100644
index 00000000000..c90db20fb75
--- /dev/null
+++ b/srcpkgs/riot-desktop/patches/electron5.patch
@@ -0,0 +1,32 @@
+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,
+-});
++});*/
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index df6b790d655..1bc9ed54a54 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
 version=1.2.1
-revision=1
+revision=2
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"

             reply	other threads:[~2019-06-18 10:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-18 10:16 voidlinux-github [this message]
2019-06-18 11:03 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12527@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).