* [PR PATCH] element-desktop: update to 1.10.0.
@ 2022-01-31 19:37 jcgruenhage
2022-02-01 6:57 ` [PR PATCH] [Updated] " jcgruenhage
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: jcgruenhage @ 2022-01-31 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1263 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 10801 bytes --]
From 51464198c0e7d51626a4b66d673bee1818d55933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 176 ++++++++++--------
srcpkgs/element-desktop/template | 6 +-
2 files changed, 101 insertions(+), 81 deletions(-)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
index 869dca38b8a4..8fe48e86a6a2 100644
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -1,125 +1,149 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea Mon Sep 17 00:00:00 2001
+From 5bba725437953f7f6f4b7b78da1891398bea1c46 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] Fixes compilation on a bunch of targets
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
---
package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
+ scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
+ 3 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
+index 7bafb02..0814dbd 100644
--- a/package.json
+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
+@@ -61,6 +61,7 @@
+ "app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
+ "detect-libc": "^1.0.3",
- "electron": "13.5",
+ "electron": "^15.3.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
+diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
+index 50554fa..3b536c5 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.
+ */
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
++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;
};
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
+
++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 x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
+
+-const x8664UnknownLinuxGnu: Target = {
++const x8664UnknownLinuxGnu: LinuxTarget = {
id: 'x86_64-unknown-linux-gnu',
platform: 'linux',
arch: 'x64',
+ libC: 'glibc',
+};
-+const x8664UnknownLinuxMusl = {
++
++const x8664UnknownLinuxMusl: LinuxTarget = {
+ id: 'x86_64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'x64',
+ libC: 'musl',
+};
-+const i686UnknownLinuxGnu = {
++
++const i686UnknownLinuxGnu: LinuxTarget = {
+ id: 'i686-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'glibc',
+};
-+const i686UnknownLinuxMusl = {
++
++const i686UnknownLinuxMusl: LinuxTarget = {
+ id: 'i686-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'musl',
+};
-+const aarch64UnknownLinuxGnu = {
++
++const aarch64UnknownLinuxGnu: LinuxTarget = {
+ id: 'aarch64-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'glibc',
+};
-+const aarch64UnknownLinuxMusl = {
++
++const aarch64UnknownLinuxMusl: LinuxTarget = {
+ id: 'aarch64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'musl',
+};
-+const powerpc64leUnknownLinuxGnu = {
++
++const powerpc64leUnknownLinuxGnu: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'glibc',
+};
-+const powerpc64leUnknownLinuxMusl = {
++
++const powerpc64leUnknownLinuxMusl: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'musl',
};
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
+
+ export const TARGETS: Record<TargetId, Target> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
'i686-pc-windows-msvc': i686PcWindowsMsvc,
'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
@@ -129,30 +153,26 @@ index 0a965fc..07349fc 100644
+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
};
+
// The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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.libC === detect_libc_1.family)));
++ (
++ process.platform !== 'linux' ||
++ (target as LinuxTarget).libC === processLibC
++ )
+ ));
}
- exports.getHost = getHost;
- function isHostId(id) {
+
diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
+index 4ef66b4..f1c154e 100644
--- a/yarn.lock
+++ b/yarn.lock
-@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -2019,7 +2019,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
@@ -162,5 +182,5 @@ index ae661ba..782282f 100644
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
--
-2.34.1
+2.35.0
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..dfdd5c3505be 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.9.7
+version=1.10.0
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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="6a4057c2d1cfbca383aae8ab6e71780cb513f72d6f18d38f51aaa642080d2a12
+ 8c8b6ee908e50a1466b92c1a8d8941ebeaf1aad1ae4828e0654394112dd56aed"
patch_args="-Np1 -d ../${pkgname}-${version}"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.0.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
@ 2022-02-01 6:57 ` jcgruenhage
2022-02-02 6:17 ` jcgruenhage
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-02-01 6:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 10801 bytes --]
From 2a9d205e359ebbab8730657289515f3174e16a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.0.
---
...es-compilation-on-a-bunch-of-targets.patch | 176 ++++++++++--------
srcpkgs/element-desktop/template | 6 +-
2 files changed, 101 insertions(+), 81 deletions(-)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
index 869dca38b8a4..8fe48e86a6a2 100644
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -1,125 +1,149 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea Mon Sep 17 00:00:00 2001
+From 5bba725437953f7f6f4b7b78da1891398bea1c46 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] Fixes compilation on a bunch of targets
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
---
package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
+ scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
+ 3 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
+index 7bafb02..0814dbd 100644
--- a/package.json
+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
+@@ -61,6 +61,7 @@
+ "app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
+ "detect-libc": "^1.0.3",
- "electron": "13.5",
+ "electron": "^15.3.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
+diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
+index 50554fa..3b536c5 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.
+ */
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
++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;
};
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
+
++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 x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
+
+-const x8664UnknownLinuxGnu: Target = {
++const x8664UnknownLinuxGnu: LinuxTarget = {
id: 'x86_64-unknown-linux-gnu',
platform: 'linux',
arch: 'x64',
+ libC: 'glibc',
+};
-+const x8664UnknownLinuxMusl = {
++
++const x8664UnknownLinuxMusl: LinuxTarget = {
+ id: 'x86_64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'x64',
+ libC: 'musl',
+};
-+const i686UnknownLinuxGnu = {
++
++const i686UnknownLinuxGnu: LinuxTarget = {
+ id: 'i686-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'glibc',
+};
-+const i686UnknownLinuxMusl = {
++
++const i686UnknownLinuxMusl: LinuxTarget = {
+ id: 'i686-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'musl',
+};
-+const aarch64UnknownLinuxGnu = {
++
++const aarch64UnknownLinuxGnu: LinuxTarget = {
+ id: 'aarch64-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'glibc',
+};
-+const aarch64UnknownLinuxMusl = {
++
++const aarch64UnknownLinuxMusl: LinuxTarget = {
+ id: 'aarch64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'musl',
+};
-+const powerpc64leUnknownLinuxGnu = {
++
++const powerpc64leUnknownLinuxGnu: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'glibc',
+};
-+const powerpc64leUnknownLinuxMusl = {
++
++const powerpc64leUnknownLinuxMusl: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'musl',
};
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
+
+ export const TARGETS: Record<TargetId, Target> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
'i686-pc-windows-msvc': i686PcWindowsMsvc,
'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
@@ -129,30 +153,26 @@ index 0a965fc..07349fc 100644
+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
};
+
// The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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.libC === detect_libc_1.family)));
++ (
++ process.platform !== 'linux' ||
++ (target as LinuxTarget).libC === processLibC
++ )
+ ));
}
- exports.getHost = getHost;
- function isHostId(id) {
+
diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
+index 4ef66b4..f1c154e 100644
--- a/yarn.lock
+++ b/yarn.lock
-@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -2019,7 +2019,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
@@ -162,5 +182,5 @@ index ae661ba..782282f 100644
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
--
-2.34.1
+2.35.0
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..dfdd5c3505be 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.9.7
+version=1.10.0
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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="6a4057c2d1cfbca383aae8ab6e71780cb513f72d6f18d38f51aaa642080d2a12
+ 8c8b6ee908e50a1466b92c1a8d8941ebeaf1aad1ae4828e0654394112dd56aed"
patch_args="-Np1 -d ../${pkgname}-${version}"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.0.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
2022-02-01 6:57 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-02-02 6:17 ` jcgruenhage
2022-02-12 11:26 ` jcgruenhage
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-02-02 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 10801 bytes --]
From 232281fcfd1b8c6d85e253e811e5cf6f093e4afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.1.
---
...es-compilation-on-a-bunch-of-targets.patch | 176 ++++++++++--------
srcpkgs/element-desktop/template | 6 +-
2 files changed, 101 insertions(+), 81 deletions(-)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
index 869dca38b8a4..8fe48e86a6a2 100644
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -1,125 +1,149 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea Mon Sep 17 00:00:00 2001
+From 5bba725437953f7f6f4b7b78da1891398bea1c46 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] Fixes compilation on a bunch of targets
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
---
package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
+ scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
+ 3 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
+index 7bafb02..0814dbd 100644
--- a/package.json
+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
+@@ -61,6 +61,7 @@
+ "app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
+ "detect-libc": "^1.0.3",
- "electron": "13.5",
+ "electron": "^15.3.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
+diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
+index 50554fa..3b536c5 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.
+ */
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
++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;
};
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
+
++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 x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
+
+-const x8664UnknownLinuxGnu: Target = {
++const x8664UnknownLinuxGnu: LinuxTarget = {
id: 'x86_64-unknown-linux-gnu',
platform: 'linux',
arch: 'x64',
+ libC: 'glibc',
+};
-+const x8664UnknownLinuxMusl = {
++
++const x8664UnknownLinuxMusl: LinuxTarget = {
+ id: 'x86_64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'x64',
+ libC: 'musl',
+};
-+const i686UnknownLinuxGnu = {
++
++const i686UnknownLinuxGnu: LinuxTarget = {
+ id: 'i686-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'glibc',
+};
-+const i686UnknownLinuxMusl = {
++
++const i686UnknownLinuxMusl: LinuxTarget = {
+ id: 'i686-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'musl',
+};
-+const aarch64UnknownLinuxGnu = {
++
++const aarch64UnknownLinuxGnu: LinuxTarget = {
+ id: 'aarch64-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'glibc',
+};
-+const aarch64UnknownLinuxMusl = {
++
++const aarch64UnknownLinuxMusl: LinuxTarget = {
+ id: 'aarch64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'musl',
+};
-+const powerpc64leUnknownLinuxGnu = {
++
++const powerpc64leUnknownLinuxGnu: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'glibc',
+};
-+const powerpc64leUnknownLinuxMusl = {
++
++const powerpc64leUnknownLinuxMusl: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'musl',
};
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
+
+ export const TARGETS: Record<TargetId, Target> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
'i686-pc-windows-msvc': i686PcWindowsMsvc,
'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
@@ -129,30 +153,26 @@ index 0a965fc..07349fc 100644
+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
};
+
// The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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.libC === detect_libc_1.family)));
++ (
++ process.platform !== 'linux' ||
++ (target as LinuxTarget).libC === processLibC
++ )
+ ));
}
- exports.getHost = getHost;
- function isHostId(id) {
+
diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
+index 4ef66b4..f1c154e 100644
--- a/yarn.lock
+++ b/yarn.lock
-@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -2019,7 +2019,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
@@ -162,5 +182,5 @@ index ae661ba..782282f 100644
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
--
-2.34.1
+2.35.0
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..2987c251449e 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.9.7
+version=1.10.1
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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="00945a85c58bea82d79af17389b02c2c579fe08b4a3c1239a727c0af4fc07a1f
+ 03dc51a903c06e9c13b63415f4d393392ed8e0286ae6084eba8134d55dcf55ec"
patch_args="-Np1 -d ../${pkgname}-${version}"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.0.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
2022-02-01 6:57 ` [PR PATCH] [Updated] " jcgruenhage
2022-02-02 6:17 ` jcgruenhage
@ 2022-02-12 11:26 ` jcgruenhage
2022-03-26 20:44 ` jcgruenhage
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-02-12 11:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 10801 bytes --]
From 12fffcc6c32ac4e2896f27f87864d4d4a4d92989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.1.
---
...es-compilation-on-a-bunch-of-targets.patch | 176 ++++++++++--------
srcpkgs/element-desktop/template | 6 +-
2 files changed, 101 insertions(+), 81 deletions(-)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
index 869dca38b8a4..8fe48e86a6a2 100644
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -1,125 +1,149 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea Mon Sep 17 00:00:00 2001
+From 5bba725437953f7f6f4b7b78da1891398bea1c46 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] Fixes compilation on a bunch of targets
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
---
package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
+ scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
+ 3 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
+index 7bafb02..0814dbd 100644
--- a/package.json
+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
+@@ -61,6 +61,7 @@
+ "app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
+ "detect-libc": "^1.0.3",
- "electron": "13.5",
+ "electron": "^15.3.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
+diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
+index 50554fa..3b536c5 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.
+ */
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
++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;
};
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
+
++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 x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
+
+-const x8664UnknownLinuxGnu: Target = {
++const x8664UnknownLinuxGnu: LinuxTarget = {
id: 'x86_64-unknown-linux-gnu',
platform: 'linux',
arch: 'x64',
+ libC: 'glibc',
+};
-+const x8664UnknownLinuxMusl = {
++
++const x8664UnknownLinuxMusl: LinuxTarget = {
+ id: 'x86_64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'x64',
+ libC: 'musl',
+};
-+const i686UnknownLinuxGnu = {
++
++const i686UnknownLinuxGnu: LinuxTarget = {
+ id: 'i686-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'glibc',
+};
-+const i686UnknownLinuxMusl = {
++
++const i686UnknownLinuxMusl: LinuxTarget = {
+ id: 'i686-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ia32',
+ libC: 'musl',
+};
-+const aarch64UnknownLinuxGnu = {
++
++const aarch64UnknownLinuxGnu: LinuxTarget = {
+ id: 'aarch64-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'glibc',
+};
-+const aarch64UnknownLinuxMusl = {
++
++const aarch64UnknownLinuxMusl: LinuxTarget = {
+ id: 'aarch64-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'arm64',
+ libC: 'musl',
+};
-+const powerpc64leUnknownLinuxGnu = {
++
++const powerpc64leUnknownLinuxGnu: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-gnu',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'glibc',
+};
-+const powerpc64leUnknownLinuxMusl = {
++
++const powerpc64leUnknownLinuxMusl: LinuxTarget = {
+ id: 'powerpc64le-unknown-linux-musl',
+ platform: 'linux',
+ arch: 'ppc64',
+ libC: 'musl',
};
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
+
+ export const TARGETS: Record<TargetId, Target> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
'i686-pc-windows-msvc': i686PcWindowsMsvc,
'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
+ 'i686-unknown-linux-musl': i686UnknownLinuxMusl,
+ 'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
+ 'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
@@ -129,30 +153,26 @@ index 0a965fc..07349fc 100644
+ 'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
+ 'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
};
+
// The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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.libC === detect_libc_1.family)));
++ (
++ process.platform !== 'linux' ||
++ (target as LinuxTarget).libC === processLibC
++ )
+ ));
}
- exports.getHost = getHost;
- function isHostId(id) {
+
diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
+index 4ef66b4..f1c154e 100644
--- a/yarn.lock
+++ b/yarn.lock
-@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -2019,7 +2019,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
@@ -162,5 +182,5 @@ index ae661ba..782282f 100644
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
--
-2.34.1
+2.35.0
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..2987c251449e 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.9.7
+version=1.10.1
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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="00945a85c58bea82d79af17389b02c2c579fe08b4a3c1239a727c0af4fc07a1f
+ 03dc51a903c06e9c13b63415f4d393392ed8e0286ae6084eba8134d55dcf55ec"
patch_args="-Np1 -d ../${pkgname}-${version}"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.0.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (2 preceding siblings ...)
2022-02-12 11:26 ` jcgruenhage
@ 2022-03-26 20:44 ` jcgruenhage
2022-03-30 5:43 ` element-desktop: update to 1.10.7 notramo
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-03-26 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 17756 bytes --]
From a022550fcc22d01cfd189b6a9135e09493b2c3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.7.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 186 ++++++++++++++++++
...eb_0001-remove-dependency-on-sentry.patch} | 26 ++-
...01-remove-dependency-on-sentry.patch.args} | 0
srcpkgs/element-desktop/template | 8 +-
5 files changed, 206 insertions(+), 180 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (73%)
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch.args => element-web_0001-remove-dependency-on-sentry.patch.args} (100%)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..c36e1799341a
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,186 @@
+From c96aaabeb8d01aa31cf6b7554aa312d6d3aa2b09 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] Fixes compilation on a bunch of 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 984a9cb..594daab 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 50554fa..3b536c5 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> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
+ 'i686-pc-windows-msvc': i686PcWindowsMsvc,
+ 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
++ '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,
+ };
+
+ // The set of targets we build by default, sorted by increasing complexity so
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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 b133742..a735c29 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2019,7 +2019,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.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 73%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..1dba3793ac25 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,13 +1,16 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From 57f3708ac987200841e568ac50345a7256c37d74 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index e8283af09..e34439f16 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
@@ -15,11 +18,11 @@ index 078c772..5b5c430 100644
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index fe72386a3..58eebeb59 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
@@ -30,7 +33,7 @@ index 3aed215..7babcef 100644
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -626,12 +625,6 @@ module.exports = (env, argv) => {
}),
useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..df90c259c72b 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.9.7
+version=1.10.7
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,15 +18,15 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="f548d2fe166e7a8be98d0fd8b8df19a55b6274c2b985499f6380d32cb4b7c650
+ 57352bd81dc05924f5b25bddab95df651d5058761d6a63398364a65024ea0396"
patch_args="-Np1 -d ../${pkgname}-${version}"
export USE_SYSTEM_APP_BUILDER=true
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ ln -s ../element-web-${version}/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
}
pre_build() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (3 preceding siblings ...)
2022-03-26 20:44 ` jcgruenhage
@ 2022-03-30 5:43 ` notramo
2022-03-30 5:44 ` notramo
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: notramo @ 2022-03-30 5:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by notramo on void-packages repository
https://github.com/void-linux/void-packages/pull/35336#issuecomment-1082644786
Comment:
Element Desktop 1.10.8 has been released with a security fix.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (4 preceding siblings ...)
2022-03-30 5:43 ` element-desktop: update to 1.10.7 notramo
@ 2022-03-30 5:44 ` notramo
2022-03-30 13:42 ` [PR PATCH] [Updated] " jcgruenhage
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: notramo @ 2022-03-30 5:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by notramo on void-packages repository
https://github.com/void-linux/void-packages/pull/35336#issuecomment-1082644786
Comment:
@jcgruenhage, Element Desktop 1.10.8 has been released with a security fix.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (5 preceding siblings ...)
2022-03-30 5:44 ` notramo
@ 2022-03-30 13:42 ` jcgruenhage
2022-05-03 7:05 ` jcgruenhage
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-03-30 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 17756 bytes --]
From 84da9a6ea85cd3dce2ed99a85e0f79808263c5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.8.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 186 ++++++++++++++++++
...eb_0001-remove-dependency-on-sentry.patch} | 26 ++-
...01-remove-dependency-on-sentry.patch.args} | 0
srcpkgs/element-desktop/template | 8 +-
5 files changed, 206 insertions(+), 180 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (73%)
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch.args => element-web_0001-remove-dependency-on-sentry.patch.args} (100%)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..c36e1799341a
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,186 @@
+From c96aaabeb8d01aa31cf6b7554aa312d6d3aa2b09 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] Fixes compilation on a bunch of 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 984a9cb..594daab 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 50554fa..3b536c5 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> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
+ 'i686-pc-windows-msvc': i686PcWindowsMsvc,
+ 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
++ '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,
+ };
+
+ // The set of targets we build by default, sorted by increasing complexity so
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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 b133742..a735c29 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2019,7 +2019,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.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 73%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..1dba3793ac25 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,13 +1,16 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From 57f3708ac987200841e568ac50345a7256c37d74 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index e8283af09..e34439f16 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
@@ -15,11 +18,11 @@ index 078c772..5b5c430 100644
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index fe72386a3..58eebeb59 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
@@ -30,7 +33,7 @@ index 3aed215..7babcef 100644
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -626,12 +625,6 @@ module.exports = (env, argv) => {
}),
useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..6ff737f5d6f9 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.9.7
+version=1.10.8
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,15 +18,15 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="ec11e6046ed445fe11c5c9a0241ab0875b9d18940b3fb121e1ef0feeca3b92e4
+ 25df778509c1f88f36b44e29f9629a12b2c30f35c0baeb6c2d866c22bbb47784"
patch_args="-Np1 -d ../${pkgname}-${version}"
export USE_SYSTEM_APP_BUILDER=true
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ ln -s ../element-web-${version}/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
}
pre_build() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (6 preceding siblings ...)
2022-03-30 13:42 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-05-03 7:05 ` jcgruenhage
2022-05-03 7:23 ` jcgruenhage
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-03 7:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 18368 bytes --]
From d5ffd0477c771bb7fbeea9f2d67951b14bb4bf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.11.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 186 ++++++++++++++++++
...eb_0001-remove-dependency-on-sentry.patch} | 36 ++--
...01-remove-dependency-on-sentry.patch.args} | 0
srcpkgs/element-desktop/template | 8 +-
5 files changed, 211 insertions(+), 185 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (57%)
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch.args => element-web_0001-remove-dependency-on-sentry.patch.args} (100%)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..c36e1799341a
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,186 @@
+From c96aaabeb8d01aa31cf6b7554aa312d6d3aa2b09 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] Fixes compilation on a bunch of 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 984a9cb..594daab 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 50554fa..3b536c5 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> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
+ 'i686-pc-windows-msvc': i686PcWindowsMsvc,
+ 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
++ '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,
+ };
+
+ // The set of targets we build by default, sorted by increasing complexity so
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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 b133742..a735c29 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2019,7 +2019,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.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 57%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..92a490b59734 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,38 +1,41 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From a38eae15bfa5fd31927fe7d26191ebf8b56e04ee Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index 021368599..4587b29fb 100644
--- a/package.json
+++ b/package.json
-@@ -89,7 +89,6 @@
+@@ -84,7 +84,6 @@
+ "@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index 13e969eca..0cd036a7e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
-@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
+@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+ const TerserPlugin = require('terser-webpack-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
- const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-const SentryCliPlugin = require("@sentry/webpack-plugin");
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -631,12 +630,6 @@ module.exports = (env, argv) => {
+ files: [{ match: /.*Inter.*\.woff2$/ }],
}),
- useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
- // upload to sentry if sentry env is present
- process.env.SENTRY_DSN &&
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.36.0
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..24e8e84e262a 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.9.7
+version=1.10.11
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,15 +18,15 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="74bfc64c872b078d2273cd2c2e51144437e85acc62955c4cba3fa3c8be0ad3d0
+ 307d6648ccb20eeba0528ea10b09cbb1813372b51f54d5fc7d7f488a0262dcb7"
patch_args="-Np1 -d ../${pkgname}-${version}"
export USE_SYSTEM_APP_BUILDER=true
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ ln -s ../element-web-${version}/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
}
pre_build() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (7 preceding siblings ...)
2022-05-03 7:05 ` jcgruenhage
@ 2022-05-03 7:23 ` jcgruenhage
2022-05-03 7:51 ` jcgruenhage
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-03 7:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 18754 bytes --]
From b062919c92860c84f5dc9eac4abc0c763fe6383e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.11.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 186 ++++++++++++++++++
...eb_0001-remove-dependency-on-sentry.patch} | 36 ++--
...01-remove-dependency-on-sentry.patch.args} | 0
srcpkgs/element-desktop/template | 10 +-
5 files changed, 212 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (57%)
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch.args => element-web_0001-remove-dependency-on-sentry.patch.args} (100%)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..c36e1799341a
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,186 @@
+From c96aaabeb8d01aa31cf6b7554aa312d6d3aa2b09 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] Fixes compilation on a bunch of 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 984a9cb..594daab 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 50554fa..3b536c5 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> = {
+@@ -99,7 +166,14 @@ export const TARGETS: Record<TargetId, Target> = {
+ 'universal-apple-darwin': universalAppleDarwin,
+ 'i686-pc-windows-msvc': i686PcWindowsMsvc,
+ 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
++ '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,
+ };
+
+ // The set of targets we build by default, sorted by increasing complexity so
+@@ -113,7 +187,11 @@ export const ENABLED_TARGETS: Target[] = [
+ 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 b133742..a735c29 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2019,7 +2019,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.35.1
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 57%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..92a490b59734 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,38 +1,41 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From a38eae15bfa5fd31927fe7d26191ebf8b56e04ee Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index 021368599..4587b29fb 100644
--- a/package.json
+++ b/package.json
-@@ -89,7 +89,6 @@
+@@ -84,7 +84,6 @@
+ "@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index 13e969eca..0cd036a7e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
-@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
+@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+ const TerserPlugin = require('terser-webpack-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
- const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-const SentryCliPlugin = require("@sentry/webpack-plugin");
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -631,12 +630,6 @@ module.exports = (env, argv) => {
+ files: [{ match: /.*Inter.*\.woff2$/ }],
}),
- useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
- // upload to sentry if sentry env is present
- process.env.SENTRY_DSN &&
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.36.0
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..3995940e728c 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.9.7
+version=1.10.11
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,15 +18,15 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="74bfc64c872b078d2273cd2c2e51144437e85acc62955c4cba3fa3c8be0ad3d0
+ 307d6648ccb20eeba0528ea10b09cbb1813372b51f54d5fc7d7f488a0262dcb7"
patch_args="-Np1 -d ../${pkgname}-${version}"
export USE_SYSTEM_APP_BUILDER=true
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ ln -s ../element-web-${version}/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
}
pre_build() {
@@ -45,7 +45,7 @@ pre_build() {
cd ../element-desktop-${version}
# Disable auto-updating
- vsed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
+ vsed -i 's@https://packages.element.io/desktop/update/@null@g' element.io/release/config.json
vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
npm_config_arch=$carch yarn install
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (8 preceding siblings ...)
2022-05-03 7:23 ` jcgruenhage
@ 2022-05-03 7:51 ` jcgruenhage
2022-06-10 17:12 ` [PR PATCH] [Updated] " jcgruenhage
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-03 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/35336#issuecomment-1115826103
Comment:
> Can we use create_wrksrc to make sure everything gets cleaned up?
I've looked into this for a bit, but it's not quite as trivial as I had hoped. It makes fiddeling with the patches a bit more difficult. I can't find a way to dynamically generate the patch args for the two different extracted tarballs, as `${PATCHESDIR}` is read only and writing it next to the `.patch` file in the `${XBPS_BUILDDIR}` doesn't seem to have any effect. Any idea how to handle this?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (9 preceding siblings ...)
2022-05-03 7:51 ` jcgruenhage
@ 2022-06-10 17:12 ` jcgruenhage
2022-06-10 17:39 ` classabbyamp
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-06-10 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 19073 bytes --]
From 427edd9d1835e89f7af7300e8c571783afbe7f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.14.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 184 ++++++++++++++++++
...eb_0001-remove-dependency-on-sentry.patch} | 36 ++--
...01-remove-dependency-on-sentry.patch.args} | 0
srcpkgs/element-desktop/template | 16 +-
5 files changed, 213 insertions(+), 189 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (57%)
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch.args => element-web_0001-remove-dependency-on-sentry.patch.args} (100%)
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..81fe2882b532
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,184 @@
+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/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 57%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..92a490b59734 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,38 +1,41 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From a38eae15bfa5fd31927fe7d26191ebf8b56e04ee Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index 021368599..4587b29fb 100644
--- a/package.json
+++ b/package.json
-@@ -89,7 +89,6 @@
+@@ -84,7 +84,6 @@
+ "@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index 13e969eca..0cd036a7e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
-@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
+@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+ const TerserPlugin = require('terser-webpack-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
- const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-const SentryCliPlugin = require("@sentry/webpack-plugin");
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -631,12 +630,6 @@ module.exports = (env, argv) => {
+ files: [{ match: /.*Inter.*\.woff2$/ }],
}),
- useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
- // upload to sentry if sentry env is present
- process.env.SENTRY_DSN &&
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.36.0
+
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..71f16669c265 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,12 +1,12 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.9.7
+version=1.10.14
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
- app-builder"
+ app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
libxslt minizip nss re2 snappy sqlcipher electron13"
@@ -18,15 +18,15 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
+checksum="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
+ 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
patch_args="-Np1 -d ../${pkgname}-${version}"
export USE_SYSTEM_APP_BUILDER=true
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ ln -s ../element-web-${version}/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
}
pre_build() {
@@ -38,14 +38,14 @@ pre_build() {
i686*) carch=ia32 ;;
esac
+ # Disable auto-updating
+ jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
+
# Build dependencies for element-web
npm_config_arch=$carch yarn install
# Build dependencies and alterations for element-desktop
cd ../element-desktop-${version}
-
- # Disable auto-updating
- vsed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
npm_config_arch=$carch yarn install
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (10 preceding siblings ...)
2022-06-10 17:12 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-06-10 17:39 ` classabbyamp
2022-06-10 17:41 ` classabbyamp
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2022-06-10 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35336#issuecomment-1152592001
Comment:
the issue with patching and create_wrksrc should be fixable now with `patch_args="-Np1 -d ${build_wrksrc}"`
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (11 preceding siblings ...)
2022-06-10 17:39 ` classabbyamp
@ 2022-06-10 17:41 ` classabbyamp
2022-06-10 18:30 ` [PR PATCH] [Updated] " jcgruenhage
2022-06-10 19:14 ` [PR PATCH] [Merged]: element-desktop: update to 1.10.14 Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2022-06-10 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35336#issuecomment-1152592001
Comment:
the issue with patching and create_wrksrc should be fixable now with `patch_args="-Np1 -d ${build_wrksrc}"` and `build_wrksrc="element-web-${version}"`
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] element-desktop: update to 1.10.7.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (12 preceding siblings ...)
2022-06-10 17:41 ` classabbyamp
@ 2022-06-10 18:30 ` jcgruenhage
2022-06-10 19:14 ` [PR PATCH] [Merged]: element-desktop: update to 1.10.14 Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-06-10 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 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.10.0_1
https://github.com/void-linux/void-packages/pull/35336
element-desktop: update to 1.10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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/35336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.10.0_1-35336.patch --]
[-- Type: text/x-diff, Size: 21747 bytes --]
From b142f8bd8af79acfee15bc0ce99003fc3b5fc97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 31 Jan 2022 20:33:45 +0100
Subject: [PATCH] element-desktop: update to 1.10.14.
---
...es-compilation-on-a-bunch-of-targets.patch | 166 ----------------
...es-compilation-on-a-bunch-of-targets.patch | 184 ++++++++++++++++++
...mpilation-on-a-bunch-of-targets.patch.args | 1 +
...eb_0001-remove-dependency-on-sentry.patch} | 36 ++--
...001-remove-dependency-on-sentry.patch.args | 1 +
.../patches/remove-sentry-dep.patch.args | 1 -
srcpkgs/element-desktop/template | 43 ++--
7 files changed, 234 insertions(+), 198 deletions(-)
delete mode 100644 srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
create mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
rename srcpkgs/element-desktop/patches/{remove-sentry-dep.patch => element-web_0001-remove-dependency-on-sentry.patch} (57%)
create mode 100644 srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
delete mode 100644 srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
diff --git a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 869dca38b8a4..000000000000
--- a/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bc552079ad526a8b7da12c091e384d640407c7ea 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] Fixes compilation on a bunch of targets
-
-Considering that this changes generated files, I've not submitted this
-patch directly. Instead, the original source has received a PR over at
-https://github.com/vector-im/element-builder/pull/58.
----
- package.json | 1 +
- scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
- yarn.lock | 2 +-
- 3 files changed, 74 insertions(+), 11 deletions(-)
-
-diff --git a/package.json b/package.json
-index c958137..3b371d2 100644
---- a/package.json
-+++ b/package.json
-@@ -57,6 +57,7 @@
- "allchange": "^1.0.6",
- "asar": "^2.0.1",
- "chokidar": "^3.5.2",
-+ "detect-libc": "^1.0.3",
- "electron": "13.5",
- "electron-builder": "22.11.4",
- "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.js b/scripts/hak/target.js
-index 0a965fc..07349fc 100644
---- a/scripts/hak/target.js
-+++ b/scripts/hak/target.js
-@@ -25,11 +25,26 @@ limitations under the License.
-
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
-+const detect_libc_1 = require("detect-libc");
- const aarch64AppleDarwin = {
- id: 'aarch64-apple-darwin',
- platform: 'darwin',
- arch: 'arm64',
- };
-+const x8664AppleDarwin = {
-+ id: 'x86_64-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'x64',
-+};
-+const universalAppleDarwin = {
-+ id: 'universal-apple-darwin',
-+ platform: 'darwin',
-+ arch: 'universal',
-+ subtargets: [
-+ aarch64AppleDarwin,
-+ x8664AppleDarwin,
-+ ],
-+};
- const i686PcWindowsMsvc = {
- id: 'i686-pc-windows-msvc',
- platform: 'win32',
-@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
- arch: 'x64',
- vcVarsArch: 'amd64',
- };
--const x8664AppleDarwin = {
-- id: 'x86_64-apple-darwin',
-- platform: 'darwin',
-- arch: 'x64',
--};
- const x8664UnknownLinuxGnu = {
- id: 'x86_64-unknown-linux-gnu',
- platform: 'linux',
- arch: 'x64',
-+ libC: 'glibc',
-+};
-+const x8664UnknownLinuxMusl = {
-+ id: 'x86_64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'x64',
-+ libC: 'musl',
-+};
-+const i686UnknownLinuxGnu = {
-+ id: 'i686-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'glibc',
-+};
-+const i686UnknownLinuxMusl = {
-+ id: 'i686-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ia32',
-+ libC: 'musl',
-+};
-+const aarch64UnknownLinuxGnu = {
-+ id: 'aarch64-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'glibc',
-+};
-+const aarch64UnknownLinuxMusl = {
-+ id: 'aarch64-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'arm64',
-+ libC: 'musl',
-+};
-+const powerpc64leUnknownLinuxGnu = {
-+ id: 'powerpc64le-unknown-linux-gnu',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'glibc',
-+};
-+const powerpc64leUnknownLinuxMusl = {
-+ id: 'powerpc64le-unknown-linux-musl',
-+ platform: 'linux',
-+ arch: 'ppc64',
-+ libC: 'musl',
- };
- exports.TARGETS = {
- 'aarch64-apple-darwin': aarch64AppleDarwin,
-+ 'x86_64-apple-darwin': x8664AppleDarwin,
-+ 'universal-apple-darwin': universalAppleDarwin,
- 'i686-pc-windows-msvc': i686PcWindowsMsvc,
- 'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-- 'x86_64-apple-darwin': x8664AppleDarwin,
-+ '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,
- };
- // The set of targets we build by default, sorted by increasing complexity so
- // that we fail fast when the native host target fails.
- exports.ENABLED_TARGETS = [
-- exports.TARGETS['x86_64-apple-darwin'],
-- exports.TARGETS['aarch64-apple-darwin'],
-+ exports.TARGETS['universal-apple-darwin'],
- exports.TARGETS['x86_64-unknown-linux-gnu'],
-- exports.TARGETS['i686-pc-windows-msvc'],
-+ exports.TARGETS['x86_64-pc-windows-msvc'],
- ];
- function getHost() {
- return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
-- target.arch === process.arch));
-+ target.arch === process.arch &&
-+ (process.platform !== 'linux' ||
-+ target.libC === detect_libc_1.family)));
- }
- exports.getHost = getHost;
- function isHostId(id) {
-diff --git a/yarn.lock b/yarn.lock
-index ae661ba..782282f 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -1778,7 +1778,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.34.1
-
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
new file mode 100644
index 000000000000..81fe2882b532
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -0,0 +1,184 @@
+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
new file mode 100644
index 000000000000..ed3aca96feaa
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
@@ -0,0 +1 @@
+-Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 57%
rename from srcpkgs/element-desktop/patches/remove-sentry-dep.patch
rename to srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index a67af3745722..92a490b59734 100644
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,38 +1,41 @@
-commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
-Author: q66 <daniel@octaforge.org>
-Date: Sat Dec 11 21:22:44 2021 +0100
+From a38eae15bfa5fd31927fe7d26191ebf8b56e04ee Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
- remove dependency on sentry
-
- This is unused and breaks ppc64 because it downlaods binaries.
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json | 1 -
+ webpack.config.js | 7 -------
+ 2 files changed, 8 deletions(-)
diff --git a/package.json b/package.json
-index 078c772..5b5c430 100644
+index 021368599..4587b29fb 100644
--- a/package.json
+++ b/package.json
-@@ -89,7 +89,6 @@
+@@ -84,7 +84,6 @@
+ "@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^1.18.1",
+ "@svgr/webpack": "^5.5.0",
"@types/flux": "^3.1.9",
"@types/jest": "^27.0.2",
- "@types/modernizr": "^3.5.3",
diff --git a/webpack.config.js b/webpack.config.js
-index 3aed215..7babcef 100644
+index 13e969eca..0cd036a7e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
-@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
+@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+ const TerserPlugin = require('terser-webpack-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
- const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-const SentryCliPlugin = require("@sentry/webpack-plugin");
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+@@ -631,12 +630,6 @@ module.exports = (env, argv) => {
+ files: [{ match: /.*Inter.*\.woff2$/ }],
}),
- useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
- // upload to sentry if sentry env is present
- process.env.SENTRY_DSN &&
@@ -43,3 +46,6 @@ index 3aed215..7babcef 100644
new webpack.EnvironmentPlugin(['VERSION']),
].filter(Boolean),
+--
+2.36.0
+
diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
new file mode 100644
index 000000000000..1f64306266fb
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
@@ -0,0 +1 @@
+-Np1 -d element-web
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
deleted file mode 100644
index 2eba1cb3c5ce..000000000000
--- a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a25edc04f31a..7e712cf0da9c 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,12 +1,12 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.9.7
+version=1.10.14
revision=1
-wrksrc="element-web-${version}"
+create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
- app-builder"
+ app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
libxslt minizip nss re2 snappy sqlcipher electron13"
@@ -18,15 +18,23 @@ _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="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
- b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
-
-patch_args="-Np1 -d ../${pkgname}-${version}"
+checksum="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
+ 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
export USE_SYSTEM_APP_BUILDER=true
+post_extract() {
+ mv ${pkgname}-${version} ${pkgname}
+ mv ${pkgname/desktop/web}-${version} ${pkgname/desktop/web}
+}
+
pre_patch() {
- ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
+ for patch in ${pkgname}_*.patch; do
+ ln -s ../${patch} ${pkgname}
+ done
+ for patch in ${pkgname/desktop/web}_*.patch; do
+ ln -s ../${patch} ${pkgname/desktop/web}
+ done
}
pre_build() {
@@ -38,21 +46,23 @@ pre_build() {
i686*) carch=ia32 ;;
esac
+ cd ${pkgname/desktop/web}
+ # Disable auto-updating
+ jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
+
# Build dependencies for element-web
npm_config_arch=$carch yarn install
# Build dependencies and alterations for element-desktop
- cd ../element-desktop-${version}
-
- # Disable auto-updating
- vsed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
+ cd ../${pkgname}
vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
npm_config_arch=$carch yarn install
}
do_build() {
+ cd ${pkgname/desktop/web}
yarn build
- cd ../element-desktop-${version}
+ cd ../${pkgname}
if [ "$CROSS_BUILD" ]; then
yarn run build:native --target ${XBPS_CROSS_RUST_TARGET}
else
@@ -69,11 +79,12 @@ do_build() {
}
do_install() {
+ cd ${pkgname/desktop/web}
vmkdir usr/lib/element-desktop
vmkdir etc/element-desktop
case "$XBPS_TARGET_MACHINE" in
- i686*) vcopy ../element-desktop-${version}/dist/linux-ia32-unpacked/resources /usr/lib/element-desktop/resources;;
- *) vcopy ../element-desktop-${version}/dist/linux-unpacked/resources /usr/lib/element-desktop/resources
+ i686*) vcopy ../element-desktop/dist/linux-ia32-unpacked/resources /usr/lib/element-desktop/resources;;
+ *) vcopy ../element-desktop/dist/linux-unpacked/resources /usr/lib/element-desktop/resources
esac
vinstall config.sample.json 644 /etc/element-desktop/ config.json
vcopy webapp /usr/lib/element-desktop/resources
@@ -85,7 +96,7 @@ do_install() {
vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element.svg
for i in 16 24 48 64 96 128 256 512; do
- vinstall ../element-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
+ vinstall ../element-desktop/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: element-desktop: update to 1.10.14.
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
` (13 preceding siblings ...)
2022-06-10 18:30 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-06-10 19:14 ` Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2022-06-10 19:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
There's a merged pull request on the void-packages repository
element-desktop: update to 1.10.14.
https://github.com/void-linux/void-packages/pull/35336
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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 [skip CI](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] 16+ messages in thread
end of thread, other threads:[~2022-06-10 19:14 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-31 19:37 [PR PATCH] element-desktop: update to 1.10.0 jcgruenhage
2022-02-01 6:57 ` [PR PATCH] [Updated] " jcgruenhage
2022-02-02 6:17 ` jcgruenhage
2022-02-12 11:26 ` jcgruenhage
2022-03-26 20:44 ` jcgruenhage
2022-03-30 5:43 ` element-desktop: update to 1.10.7 notramo
2022-03-30 5:44 ` notramo
2022-03-30 13:42 ` [PR PATCH] [Updated] " jcgruenhage
2022-05-03 7:05 ` jcgruenhage
2022-05-03 7:23 ` jcgruenhage
2022-05-03 7:51 ` jcgruenhage
2022-06-10 17:12 ` [PR PATCH] [Updated] " jcgruenhage
2022-06-10 17:39 ` classabbyamp
2022-06-10 17:41 ` classabbyamp
2022-06-10 18:30 ` [PR PATCH] [Updated] " jcgruenhage
2022-06-10 19:14 ` [PR PATCH] [Merged]: element-desktop: update to 1.10.14 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).