Skip to content

Commit

Permalink
Update element-desktop to version 1.11.91 / rev 75 via SR 1242244
Browse files Browse the repository at this point in the history
https://build.opensuse.org/request/show/1242244
by user dheidler + anag+factory
- Fix build by breakig the bad esbuild library for good
  * Add break-esbuild-for-good.patch

- Version 1.11.91
  ## ✨ Features
  * Implement changes to memberlist from feedback (element-hq/element-web#29029). Contributed by @MidhunSureshR.
  * Add toast for recovery keys being out of sync (element-hq/element-web#28946). Contributed by @dbkr.
  * Refactor LegacyCallHandler event emitter to use TypedEventEmitter (element-hq/element-web#29008). Contributed by @t3chguy.
  * Add `Recovery` section in the new user settings `Encryption` tab (element-hq/element-web#28673). Contributed by @florianduros.
  * Retry loading chunks to make the app more resilient (https://github.com/element-hq/element-web/pul
  • Loading branch information
dheidler authored and bmwiedemann committed Feb 6, 2025
1 parent 84be1d6 commit 2a2b2ad
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 3 deletions.
Binary file modified packages/e/element-desktop/.files
Binary file not shown.
22 changes: 22 additions & 0 deletions packages/e/element-desktop/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -1150,4 +1150,26 @@ Version 1.11.89
* Fix url preview display (https://github.com/element-hq/element-web/pull/28766).</comment>
<requestid>1238072</requestid>
</revision>
<revision rev="75" vrev="1">
<srcmd5>da7c09d0a0dc306040316c3927d65c3e</srcmd5>
<version>1.11.91</version>
<time>1738615460</time>
<user>anag+factory</user>
<comment>- Fix build by breakig the bad esbuild library for good
* Add break-esbuild-for-good.patch

- Version 1.11.91
## ✨ Features
* Implement changes to memberlist from feedback (https://github.com/element-hq/element-web/pull/29029). Contributed by @MidhunSureshR.
* Add toast for recovery keys being out of sync (https://github.com/element-hq/element-web/pull/28946). Contributed by @dbkr.
* Refactor LegacyCallHandler event emitter to use TypedEventEmitter (https://github.com/element-hq/element-web/pull/29008). Contributed by @t3chguy.
* Add `Recovery` section in the new user settings `Encryption` tab (https://github.com/element-hq/element-web/pull/28673). Contributed by @florianduros.
* Retry loading chunks to make the app more resilient (https://github.com/element-hq/element-web/pull/29001). Contributed by @t3chguy.
* Clear account idb table on logout (https://github.com/element-hq/element-web/pull/28996). Contributed by @t3chguy.
* Implement new memberlist design with MVVM architecture (https://github.com/element-hq/element-web/pull/28874). Contributed by @MidhunSureshR.
## 🐛 Bug Fixes
* https://github.com/element-hq/element-web/pull/29035). Contributed by @RiotRobot.
* React to MatrixEvent sender/target being updated for rendering state events (https://github.com/element-hq/element-web/pull/28947). Contributed by @t3chguy.</comment>
<requestid>1242244</requestid>
</revision>
</revisionlist>
41 changes: 41 additions & 0 deletions packages/e/element-desktop/break-esbuild-for-good.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
diff -ru a/node_modules/esbuild/install.js b/node_modules/esbuild/install.js
--- a/node_modules/esbuild/install.js 2025-02-01 12:49:52.486000000 +0100
+++ b/node_modules/esbuild/install.js 2025-02-02 17:53:44.578575982 +0100
@@ -27,7 +27,7 @@
var os = require("os");
var path = require("path");
var ESBUILD_BINARY_PATH = process.env.ESBUILD_BINARY_PATH || ESBUILD_BINARY_PATH;
-var isValidBinaryPath = (x) => !!x && x !== "/usr/bin/esbuild";
+var isValidBinaryPath = (x) => !!x
var knownWindowsPackages = {
"win32 arm64 LE": "@esbuild/win32-arm64",
"win32 ia32 LE": "@esbuild/win32-ia32",
@@ -94,6 +94,7 @@
var toPath = path2.join(__dirname, "bin", "esbuild");
var isToPathJS = true;
function validateBinaryVersion(...command) {
+ return;
command.push("--version");
let stdout;
try {
diff -ru a/node_modules/esbuild/lib/main.js b/node_modules/esbuild/lib/main.js
--- a/node_modules/esbuild/lib/main.js 2025-02-01 12:49:52.486000000 +0100
+++ b/node_modules/esbuild/lib/main.js 2025-02-02 18:05:52.027111771 +0100
@@ -662,9 +662,6 @@
if (isFirstPacket) {
isFirstPacket = false;
let binaryVersion = String.fromCharCode(...bytes);
- if (binaryVersion !== "0.23.1") {
- throw new Error(`Cannot start service: Host version "${"0.23.1"}" does not match binary version ${quote(binaryVersion)}`);
- }
return;
}
let packet = decodePacket(bytes);
@@ -1680,6 +1677,7 @@
return path.join(esbuildLibDir, `downloaded-${pkg.replace("/", "-")}-${path.basename(subpath)}`);
}
function generateBinPath() {
+ return { binPath: ESBUILD_BINARY_PATH, isWASM: false };
if (isValidBinaryPath(ESBUILD_BINARY_PATH)) {
if (!fs.existsSync(ESBUILD_BINARY_PATH)) {
console.warn(`[esbuild] Ignoring bad configuration: ESBUILD_BINARY_PATH=${ESBUILD_BINARY_PATH}`);
1 change: 0 additions & 1 deletion packages/e/element-desktop/element-desktop-1.11.90.tar.gz

This file was deleted.

1 change: 1 addition & 0 deletions packages/e/element-desktop/element-desktop-1.11.91.tar.gz
25 changes: 25 additions & 0 deletions packages/e/element-desktop/element-desktop.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
-------------------------------------------------------------------
Sun Feb 2 16:41:33 UTC 2025 - Dominik Heidler <[email protected]>

- Fix build by breakig the bad esbuild library for good
* Add break-esbuild-for-good.patch

-------------------------------------------------------------------
Sat Feb 1 10:50:43 UTC 2025 - Dominik Heidler <[email protected]>

- Version 1.11.91
## ✨ Features

* Implement changes to memberlist from feedback (https://github.com/element-hq/element-web/pull/29029). Contributed by @MidhunSureshR.
* Add toast for recovery keys being out of sync (https://github.com/element-hq/element-web/pull/28946). Contributed by @dbkr.
* Refactor LegacyCallHandler event emitter to use TypedEventEmitter (https://github.com/element-hq/element-web/pull/29008). Contributed by @t3chguy.
* Add `Recovery` section in the new user settings `Encryption` tab (https://github.com/element-hq/element-web/pull/28673). Contributed by @florianduros.
* Retry loading chunks to make the app more resilient (https://github.com/element-hq/element-web/pull/29001). Contributed by @t3chguy.
* Clear account idb table on logout (https://github.com/element-hq/element-web/pull/28996). Contributed by @t3chguy.
* Implement new memberlist design with MVVM architecture (https://github.com/element-hq/element-web/pull/28874). Contributed by @MidhunSureshR.

## 🐛 Bug Fixes

* https://github.com/element-hq/element-web/pull/29035). Contributed by @RiotRobot.
* React to MatrixEvent sender/target being updated for rendering state events (https://github.com/element-hq/element-web/pull/28947). Contributed by @t3chguy.

-------------------------------------------------------------------
Wed Jan 15 14:01:29 UTC 2025 - Dominik Heidler <[email protected]>

Expand Down
17 changes: 16 additions & 1 deletion packages/e/element-desktop/element-desktop.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: element-desktop
Version: 1.11.90
Version: 1.11.91
Release: 0
Summary: A glossy Matrix collaboration client - desktop
License: AGPL-3.0-only or GPL-3.0-only
Expand All @@ -32,6 +32,7 @@ Patch1: 7za-path.patch
Patch2: cc-link-lib-no-static.patch
Patch3: remove-fuses.patch
Patch4: no-walrus-operator.patch
Patch5: break-esbuild-for-good.patch
BuildRequires: element-web = %{version}
BuildRequires: app-builder
BuildRequires: cargo
Expand All @@ -41,6 +42,7 @@ BuildRequires: jq
BuildRequires: nodejs-electron-devel
BuildRequires: pkgconfig(openssl)
BuildRequires: zstd
BuildRequires: esbuild
%if 0%{?fedora}
BuildRequires: rust-srpm-macros
%else
Expand All @@ -49,7 +51,11 @@ BuildRequires: cargo-auditable
%endif

BuildRequires: libsecret-devel
%if 0%{?sle_version} <= 150600
BuildRequires: gcc13-c++
%else
BuildRequires: gcc-c++
%endif
Requires: element-web = %{version}
Requires: nodejs-electron%{_isa}

Expand Down Expand Up @@ -88,6 +94,12 @@ export ELECTRON_SKIP_BINARY_DOWNLOAD=1
export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
export USE_SYSTEM_APP_BUILDER=true
export OPENSSL_NO_VENDOR=1
%if 0%{?sle_version} <= 150600
mkdir -p /tmp/bin
ln -sf /usr/bin/gcc-13 /tmp/bin/gcc
ln -sf /usr/bin/g++-13 /tmp/bin/g++
export PATH="/tmp/bin:$PATH"
%endif
# The `cc` crate tries to be too clever and passes some default cflags when building sqlcipher.
# Disable these and use only the ones from CFLAGS env. variable
export CRATE_CC_NO_DEFAULTS=1
Expand All @@ -100,6 +112,8 @@ export RUSTC_BOOTSTRAP=1
export RUSTC_LOG='rustc_codegen_ssa::back::link=info'
export RUSTFLAGS="%{build_rustflags} --verbose -Cstrip=none"
export CARGO_TERM_VERBOSE=true
# break esbuild for good - see https://en.opensuse.org/openSUSE:Packaging_Electron#esbuild and Patch5
export ESBUILD_BINARY_PATH=/usr/bin/esbuild

%electron_rebuild

Expand All @@ -122,6 +136,7 @@ popd
npm run build:ts
npm run build:res
npx --no-install electron-builder --linux dir --universal -c.electronDist=%{_libdir}/electron -c.asar=false -c.nodeGypRebuild=false -c.npmRebuild=false
rm -rf "/tmp/bin"



Expand Down
2 changes: 1 addition & 1 deletion packages/e/element-desktop/vendor.tar.zst

0 comments on commit 2a2b2ad

Please sign in to comment.