* [PR PATCH] element-desktop: update to 1.11.0.
@ 2022-07-07 8:20 jcgruenhage
2022-07-07 8:30 ` wael444
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-07 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 8542 bytes --]
From ec03de623730f44c72668aea7b4b36853637cf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 6 +-
3 files changed, 3 insertions(+), 188 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7e712cf0da9c..af65250ce93d 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
@ 2022-07-07 8:30 ` wael444
2022-07-08 12:13 ` [PR PATCH] [Updated] " jcgruenhage
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: wael444 @ 2022-07-07 8:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by wael444 on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1177249910
Comment:
> Output:
Official Linux/ia32 support is deprecated.
For more info: https://electronjs.org/blog/linux-32bit-support
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
2022-07-07 8:30 ` wael444
@ 2022-07-08 12:13 ` jcgruenhage
2022-07-10 19:16 ` Johnnynator
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-08 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 8542 bytes --]
From 16dff0ecaccf56cbcb22a68786ecaf99ffff00c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 6 +-
3 files changed, 3 insertions(+), 188 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9ade28534db6..f1170f05696e 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
2022-07-07 8:30 ` wael444
2022-07-08 12:13 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-10 19:16 ` Johnnynator
2022-07-11 4:48 ` [PR PATCH] [Updated] " jcgruenhage
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-10 19:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1179783137
Comment:
Can you update the PR to use electron 19.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (2 preceding siblings ...)
2022-07-10 19:16 ` Johnnynator
@ 2022-07-11 4:48 ` jcgruenhage
2022-07-11 5:10 ` jcgruenhage
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 4:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 8991 bytes --]
From 96637b8390e9f6adc8876c78e9f47911237f764a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 8 +-
3 files changed, 4 insertions(+), 189 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9ade28534db6..2bc559628ed5 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python3 curl
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron13"
+ libxslt minizip nss re2 snappy sqlcipher electron19"
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (3 preceding siblings ...)
2022-07-11 4:48 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-11 5:10 ` jcgruenhage
2022-07-11 5:13 ` Johnnynator
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 5:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1179972843
Comment:
@Johnnynator done
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (4 preceding siblings ...)
2022-07-11 5:10 ` jcgruenhage
@ 2022-07-11 5:13 ` Johnnynator
2022-07-11 5:23 ` jcgruenhage
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-11 5:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1179974499
Comment:
Also needs to be changed in /[srcpkgs](https://github.com/void-linux/void-packages/tree/96637b8390e9f6adc8876c78e9f47911237f764a/srcpkgs)/[element-desktop](https://github.com/void-linux/void-packages/tree/96637b8390e9f6adc8876c78e9f47911237f764a/srcpkgs/element-desktop)/[files](https://github.com/void-linux/void-packages/tree/96637b8390e9f6adc8876c78e9f47911237f764a/srcpkgs/element-desktop/files)/element-desktop
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (5 preceding siblings ...)
2022-07-11 5:13 ` Johnnynator
@ 2022-07-11 5:23 ` jcgruenhage
2022-07-11 5:27 ` [PR PATCH] [Updated] " jcgruenhage
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 5:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1179979668
Comment:
... yeah. Building again and trying it out with that changed as well now
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (6 preceding siblings ...)
2022-07-11 5:23 ` jcgruenhage
@ 2022-07-11 5:27 ` jcgruenhage
2022-07-11 8:43 ` jcgruenhage
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 5:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 9457 bytes --]
From 209e733d378a930427aa5f8d2a2124e691c4d53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
srcpkgs/element-desktop/files/element-desktop | 2 +-
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 8 +-
4 files changed, 5 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop
index b264e2674981..6b1e335e3d46 100644
--- a/srcpkgs/element-desktop/files/element-desktop
+++ b/srcpkgs/element-desktop/files/element-desktop
@@ -1,2 +1,2 @@
#!/bin/sh
-exec electron13 /usr/lib/element-desktop/resources/app.asar "$@"
+exec electron19 /usr/lib/element-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9ade28534db6..2bc559628ed5 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python3 curl
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron13"
+ libxslt minizip nss re2 snappy sqlcipher electron19"
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (7 preceding siblings ...)
2022-07-11 5:27 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-11 8:43 ` jcgruenhage
2022-07-11 9:14 ` jcgruenhage
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180127140
Comment:
So, since I updated electron element is *super* slow. Extremely slow. Very much unusable...
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (8 preceding siblings ...)
2022-07-11 8:43 ` jcgruenhage
@ 2022-07-11 9:14 ` jcgruenhage
2022-07-11 10:04 ` Johnnynator
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 9:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180157814
Comment:
To put some numbers behind that: I'm currently waiting 5 to 15 seconds for switching between chats and even typed characters don't appear right away :/
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (9 preceding siblings ...)
2022-07-11 9:14 ` jcgruenhage
@ 2022-07-11 10:04 ` Johnnynator
2022-07-11 11:55 ` jcgruenhage
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-11 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180204535
Comment:
Musl or glibc? Also how is the performance when using upstream electron?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (10 preceding siblings ...)
2022-07-11 10:04 ` Johnnynator
@ 2022-07-11 11:55 ` jcgruenhage
2022-07-11 14:38 ` jcgruenhage
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180318310
Comment:
glibc. How do I try it with upstream electron? Don't know much about electron sadly (or maybe not sadly? :D)
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (11 preceding siblings ...)
2022-07-11 11:55 ` jcgruenhage
@ 2022-07-11 14:38 ` jcgruenhage
2022-07-11 19:24 ` Johnnynator
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-11 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180493847
Comment:
I've also noticed some crashes, element-desktop crashed on me for the third time now today...
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (12 preceding siblings ...)
2022-07-11 14:38 ` jcgruenhage
@ 2022-07-11 19:24 ` Johnnynator
2022-07-12 5:58 ` [PR PATCH] [Updated] " jcgruenhage
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-11 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1180778370
Comment:
The issue is specific to our electron19, using the upstream one downloaded from https://github.com/electron/electron/releases/tag/v19.0.8 does not exhibit the same issues.
I did probably do most of my tests with a too simple Electron app.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (13 preceding siblings ...)
2022-07-11 19:24 ` Johnnynator
@ 2022-07-12 5:58 ` jcgruenhage
2022-07-13 7:16 ` Johnnynator
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-12 5:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 8542 bytes --]
From d25bfc0476be1d082fcc65f49300a47fbb0b7102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 6 +-
3 files changed, 3 insertions(+), 188 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9ade28534db6..f1170f05696e 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (14 preceding siblings ...)
2022-07-12 5:58 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 7:16 ` Johnnynator
2022-07-13 16:26 ` [PR PATCH] [Updated] " jcgruenhage
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-13 7:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1182854386
Comment:
Can you retest with rev 2 of electron19. The issues seem to be fixed at least for me.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (15 preceding siblings ...)
2022-07-13 7:16 ` Johnnynator
@ 2022-07-13 16:26 ` jcgruenhage
2022-07-13 16:26 ` jcgruenhage
2022-07-13 17:13 ` [PR PATCH] [Merged]: " Johnnynator
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908
element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 9457 bytes --]
From 2c93ce204d6f0ec8f2eef899c1528b4b935d0c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.
---
srcpkgs/element-desktop/files/element-desktop | 2 +-
...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
...mpilation-on-a-bunch-of-targets.patch.args | 1 -
srcpkgs/element-desktop/template | 8 +-
4 files changed, 5 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop
index b264e2674981..6b1e335e3d46 100644
--- a/srcpkgs/element-desktop/files/element-desktop
+++ b/srcpkgs/element-desktop/files/element-desktop
@@ -1,2 +1,2 @@
#!/bin/sh
-exec electron13 /usr/lib/element-desktop/resources/app.asar "$@"
+exec electron19 /usr/lib/element-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json | 1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock | 2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
- "app-builder-lib": "^22.14.10",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "^17",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
- 'universal-apple-darwin' |
- 'i686-pc-windows-msvc' |
- 'x86_64-pc-windows-msvc' |
-- 'x86_64-unknown-linux-gnu';
-+ 'i686-unknown-linux-musl' |
-+ 'i686-unknown-linux-gnu' |
-+ 'x86_64-unknown-linux-musl' |
-+ 'x86_64-unknown-linux-gnu' |
-+ 'aarch64-unknown-linux-musl' |
-+ 'aarch64-unknown-linux-gnu' |
-+ 'powerpc64le-unknown-linux-musl' |
-+ 'powerpc64le-unknown-linux-gnu';
-
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
-
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
-
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
-
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
- id: TargetId;
- platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
- vcVarsArch: VcVarsArch;
- };
-
-+export type LinuxTarget = Target & {
-+ platform: 'linux';
-+ libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
- arch: 'universal';
- subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
- vcVarsArch: 'amd64',
- };
-
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
-
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
- // Linux
-+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
- 'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+ 'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+ 'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
-
- export function getHost(): Target {
- return Object.values(TARGETS).find(target => (
- target.platform === process.platform &&
-- target.arch === process.arch
-+ target.arch === process.arch &&
-+ (
-+ process.platform !== 'linux' ||
-+ (target as LinuxTarget).libC === processLibC
-+ )
- ));
- }
-
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
---
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9ade28534db6..2bc559628ed5 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.10.14
+version=1.11.0
revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python3 curl
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron13"
+ libxslt minizip nss re2 snappy sqlcipher electron19"
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
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="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
export USE_SYSTEM_APP_BUILDER=true
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (16 preceding siblings ...)
2022-07-13 16:26 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 16:26 ` jcgruenhage
2022-07-13 17:13 ` [PR PATCH] [Merged]: " Johnnynator
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/37908#issuecomment-1183431398
Comment:
Tried with rev2, works as expected, performance problem is gone.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: element-desktop: update to 1.11.0.
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
` (17 preceding siblings ...)
2022-07-13 16:26 ` jcgruenhage
@ 2022-07-13 17:13 ` Johnnynator
18 siblings, 0 replies; 20+ messages in thread
From: Johnnynator @ 2022-07-13 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There's a merged pull request on the void-packages repository
element-desktop: update to 1.11.0.
https://github.com/void-linux/void-packages/pull/37908
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.
I've tested this locally on x86\_64, works as expected.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-07-13 17:13 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-07 8:20 [PR PATCH] element-desktop: update to 1.11.0 jcgruenhage
2022-07-07 8:30 ` wael444
2022-07-08 12:13 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-10 19:16 ` Johnnynator
2022-07-11 4:48 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-11 5:10 ` jcgruenhage
2022-07-11 5:13 ` Johnnynator
2022-07-11 5:23 ` jcgruenhage
2022-07-11 5:27 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-11 8:43 ` jcgruenhage
2022-07-11 9:14 ` jcgruenhage
2022-07-11 10:04 ` Johnnynator
2022-07-11 11:55 ` jcgruenhage
2022-07-11 14:38 ` jcgruenhage
2022-07-11 19:24 ` Johnnynator
2022-07-12 5:58 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 7:16 ` Johnnynator
2022-07-13 16:26 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 16:26 ` jcgruenhage
2022-07-13 17:13 ` [PR PATCH] [Merged]: " Johnnynator
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).