[PR PATCH] element-desktop: update to 1.7.8.

[PR PATCH] element-desktop: update to 1.7.8.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages element-1.7.8
https://github.com/void-linux/void-packages/pull/25210

element-desktop: update to 1.7.8.


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

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

From 9a5bdcdd8133ed6e0653a6f04615abe7dedccdcf Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 30 Sep 2020 21:38:16 +0000
Subject: [PATCH] element-desktop: update to 1.7.8.

---
 srcpkgs/element-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3ed33fbd4fb..faf19624701 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.7
+version=1.7.8
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="f9ee1c537c610c29ca3c2c358f76a2cb7126e557d72d3e4fe4cdaf18823dbbb4
- 6e378b49bab4609e7128c49471c72c00ac7e7f7ff2fe2f3427e29f453af679fb"
+checksum="50fb6f5b61fa726b8d60f919f15b2a4810cacf2043f58fa755d1d3938c0a84c9
+ a2b5499241364532b279a09c1ac98e0626a3e588678ede0775cb33604a780c13"
 nocross="depends on electron9"
 
 export USE_SYSTEM_APP_BUILDER=true

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-702069742

Comment:
Initial test of the build shows that encrypted room search has stopped working due to "missing components." Will investigate and fix before setting to ready.

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-702104189

Comment:
The problem is because Element 1.7.8 upgraded to Electron 10. Downgrading the Electron version to 9.x allows it to work. The only changes in 1.7.8 are actually an upgrade of Electron and a minor version bump to seshat.

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-702108316

Comment:
Seems like we want to wait for an Electron 10 package.

Re: element-desktop: update to 1.7.8.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705159147

Comment:
I believe electron 10 has been merged!

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705217908

Comment:
Alright, I will proceed with updating the package.

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705447660

Comment:
Building with electron 10 still results in the same error. Maybe some node dependency issue? Will investigate further.

This happens when running from the terminal.

```
node[11161]: pthread_create: Invalid argument
Keytar unexpected error: Error: Module did not self-register: '/tmp/.org.chromium.Chromium.NjTWS6'.
    at process.func [as dlopen] (electron/js2c/asar.js:140:31)
    at Object.Module._extensions..node (internal/modules/cjs/loader.js:1034:18)
    at Object.func [as .node] (electron/js2c/asar.js:149:18)
    at Module.load (internal/modules/cjs/loader.js:815:32)
    at Module._load (internal/modules/cjs/loader.js:727:14)
    at Function.Module._load (electron/js2c/asar.js:769:28)
    at Module.require (internal/modules/cjs/loader.js:852:19)
    at require (internal/modules/cjs/helpers.js:74:18)
    at Object.<anonymous> (/usr/lib/element-desktop/resources/app.asar/node_modules/keytar/lib/keytar.js:1:14)
    at Module._compile (internal/modules/cjs/loader.js:967:30)
Seshat unexpected error: Error: The module '/tmp/.org.chromium.Chromium.kW8Bq9'
was compiled against a different Node.js version using
NODE_MODULE_VERSION 82. This version of Node.js requires
NODE_MODULE_VERSION 80. Please try re-compiling or re-installing
the module (for instance, using `npm rebuild` or `npm install`).
    at process.func [as dlopen] (electron/js2c/asar.js:140:31)
    at Object.Module._extensions..node (internal/modules/cjs/loader.js:1034:18)
    at Object.func [as .node] (electron/js2c/asar.js:149:18)
    at Module.load (internal/modules/cjs/loader.js:815:32)
    at Module._load (internal/modules/cjs/loader.js:727:14)
    at Function.Module._load (electron/js2c/asar.js:769:28)
    at Module.require (internal/modules/cjs/loader.js:852:19)
    at require (internal/modules/cjs/helpers.js:74:18)
    at Object.<anonymous> (/usr/lib/element-desktop/resources/app.asar/node_modules/matrix-seshat/lib/index.js:15:16)
    at Module._compile (internal/modules/cjs/loader.js:967:30)
```

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705472318

Comment:
Ok, found the issue after checking against Arch PKGBUILD. It seems like by default, element-desktop executes against electron9, and when compiled with 10, you get a node module mismatch. I will update the PR with a script similar to this: https://aur.archlinux.org/cgit/aur.git/tree/element-desktop.sh?h=element-desktop-git

```
#!/bin/bash
exec electron10 /usr/lib/element-desktop/resources/app.asar "$@"
```

Re: element-desktop: update to 1.7.8.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705544594

Comment:
We already have a script for it:

```
#!/bin/sh
exec electron9 /usr/lib/element-desktop/resources/app.asar "$@"
```

So I guess just update it?

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-705569892

Comment:
Yep, don't even know how I didn't see that

Re: [PR PATCH] [Updated] element-desktop: update to 1.7.8.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages element-1.7.8
https://github.com/void-linux/void-packages/pull/25210

element-desktop: update to 1.7.8.


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

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

From fce6226283a635a9018c848d84e05b83e6c2e998 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 30 Sep 2020 21:38:16 +0000
Subject: [PATCH] element-desktop: update to 1.7.8.

---
 srcpkgs/element-desktop/files/element-desktop | 2 +-
 srcpkgs/element-desktop/template              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop
index d16e825046c..41a9b404020 100644
--- a/srcpkgs/element-desktop/files/element-desktop
+++ b/srcpkgs/element-desktop/files/element-desktop
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron9 /usr/lib/element-desktop/resources/app.asar "$@"
+exec electron10 /usr/lib/element-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3ed33fbd4fb..4b43f1e7fb0 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.7
+version=1.7.8
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python curl
  app-builder"
 makedepends="libsecret-devel"
 depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron9"
+ libxslt minizip nss re2 snappy sqlcipher electron10"
 short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="f9ee1c537c610c29ca3c2c358f76a2cb7126e557d72d3e4fe4cdaf18823dbbb4
- 6e378b49bab4609e7128c49471c72c00ac7e7f7ff2fe2f3427e29f453af679fb"
+checksum="50fb6f5b61fa726b8d60f919f15b2a4810cacf2043f58fa755d1d3938c0a84c9
+ a2b5499241364532b279a09c1ac98e0626a3e588678ede0775cb33604a780c13"
 nocross="depends on electron9"
 
 export USE_SYSTEM_APP_BUILDER=true
@@ -30,6 +30,7 @@ pre_build() {
 
 	# Build dependencies and alterations for element-desktop
 	cd ../element-desktop-${version}
+
 	# Disable auto-updating
 	sed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
 	sed -i 's/"target": "deb"/"target": "dir"/g' package.json

Re: element-desktop: update to 1.7.8.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/25210#issuecomment-706623386

Comment:
Building with Electron 10 and updated the launch script. No more errors, everything working.

Re: [PR PATCH] [Updated] element-desktop: update to 1.7.8.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages element-1.7.8
https://github.com/void-linux/void-packages/pull/25210

element-desktop: update to 1.7.8.


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

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

From f55b95762eae5b336794a53742ea08528d44f0fc Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 30 Sep 2020 21:38:16 +0000
Subject: [PATCH] element-desktop: update to 1.7.10.

---
 srcpkgs/element-desktop/files/element-desktop | 2 +-
 srcpkgs/element-desktop/template              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop
index d16e825046c..41a9b404020 100644
--- a/srcpkgs/element-desktop/files/element-desktop
+++ b/srcpkgs/element-desktop/files/element-desktop
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron9 /usr/lib/element-desktop/resources/app.asar "$@"
+exec electron10 /usr/lib/element-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3ed33fbd4fb..78dc408474b 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.7
+version=1.7.10
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python curl
  app-builder"
 makedepends="libsecret-devel"
 depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron9"
+ libxslt minizip nss re2 snappy sqlcipher electron10"
 short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="f9ee1c537c610c29ca3c2c358f76a2cb7126e557d72d3e4fe4cdaf18823dbbb4
- 6e378b49bab4609e7128c49471c72c00ac7e7f7ff2fe2f3427e29f453af679fb"
+checksum="dc98f25e85209b3d1bb760c73c3275b86356d6af7152e4b91541aa68240b1848
+ 9318c487500af47a51057d83f8760f8aa7951d859773ad2dad16580069f0abd4"
 nocross="depends on electron9"
 
 export USE_SYSTEM_APP_BUILDER=true
@@ -30,6 +30,7 @@ pre_build() {
 
 	# Build dependencies and alterations for element-desktop
 	cd ../element-desktop-${version}
+
 	# Disable auto-updating
 	sed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
 	sed -i 's/"target": "deb"/"target": "dir"/g' package.json

Re: [PR PATCH] [Merged]: element-desktop: update to 1.7.10.

[ericonr]

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

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

element-desktop: update to 1.7.10.
https://github.com/void-linux/void-packages/pull/25210

Description: