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

[jcgruenhage <jcgruenhage@users.noreply.github.com>]

[-- 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() {