From b0cb37ef86547e6145b4de8289c9bc63a8cbd1468503170009bcd3e034718753 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 22 Oct 2025 13:33:21 +0200 Subject: [PATCH 1/2] Version 1.12.2 --- README.md | 10 ++++++ break-esbuild-for-good.patch | 4 +-- element-desktop-1.12.0.tar.gz | 3 -- element-desktop-1.12.2.tar.gz | 3 ++ element-desktop.changes | 58 +++++++++++++++++++++++++++++++++++ element-desktop.spec | 7 ++--- fix-oxc-resolver.patch | 2 +- no-install-app-deps.patch | 11 +++++++ no-walrus-operator.patch | 32 +++---------------- prepare.sh | 6 ++-- vendor.tar.zst | 4 +-- 11 files changed, 96 insertions(+), 44 deletions(-) create mode 100644 README.md delete mode 100644 element-desktop-1.12.0.tar.gz create mode 100644 element-desktop-1.12.2.tar.gz create mode 100644 no-install-app-deps.patch diff --git a/README.md b/README.md new file mode 100644 index 0000000..3ef94b7 --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ + +## Build Results + +Current state of element-desktop in openSUSE:Factory is + +![Factory build results](https://br.opensuse.org/status/openSUSE:Factory/element-desktop/standard) + +The current state of element-desktop in the devel project build (devel:languages:nodejs) + +![Devel project build results](https://br.opensuse.org/status/devel:languages:nodejs/element-desktop) diff --git a/break-esbuild-for-good.patch b/break-esbuild-for-good.patch index 098fad3..1f5afa5 100644 --- a/break-esbuild-for-good.patch +++ b/break-esbuild-for-good.patch @@ -25,8 +25,8 @@ diff -ru a/node_modules/esbuild/lib/main.js b/node_modules/esbuild/lib/main.js if (isFirstPacket) { isFirstPacket = false; let binaryVersion = String.fromCharCode(...bytes); -- if (binaryVersion !== "0.25.9") { -- throw new Error(`Cannot start service: Host version "${"0.25.9"}" does not match binary version ${quote(binaryVersion)}`); +- if (binaryVersion !== "0.25.10") { +- throw new Error(`Cannot start service: Host version "${"0.25.10"}" does not match binary version ${quote(binaryVersion)}`); - } return; } diff --git a/element-desktop-1.12.0.tar.gz b/element-desktop-1.12.0.tar.gz deleted file mode 100644 index 735959d..0000000 --- a/element-desktop-1.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3aa1b7e62737d8b9604f4c323903c811d228dda1daa12564c3cc4ebcadbb0642 -size 3155740 diff --git a/element-desktop-1.12.2.tar.gz b/element-desktop-1.12.2.tar.gz new file mode 100644 index 0000000..19948be --- /dev/null +++ b/element-desktop-1.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb2eaf9816231cad86292145d5eb214d20305aec2fc27d901f203e4007047534 +size 3161554 diff --git a/element-desktop.changes b/element-desktop.changes index d866345..c787e06 100644 --- a/element-desktop.changes +++ b/element-desktop.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Wed Oct 22 10:39:01 UTC 2025 - Dominik Heidler + +- Add no-install-app-deps.patch to partitially run postinstall script + +------------------------------------------------------------------- +Tue Oct 21 21:03:04 UTC 2025 - Dominik Heidler + +- Version 1.12.2 + ## ✨ Features + + * Allow Desktop app to be auto-started minimised or focused (https://github.com/element-hq/element-desktop/pull/2622). Contributed by @t3chguy. + * Room List: Extend the viewport to avoid so many black spots when scrolling the room list (https://github.com/element-hq/element-web/pull/30867). Contributed by @langleyd. + * Hide calling buttons in room header before a room is created (https://github.com/element-hq/element-web/pull/30816). Contributed by @Half-Shot. + * Improve invite dialog ui - Part 2 (https://github.com/element-hq/element-web/pull/30836). Contributed by @florianduros. + + ## 🐛 Bug Fixes + + * Fix hardlinks appearing in and breaking deb packages (https://github.com/element-hq/element-desktop/pull/2609). Contributed by @t3chguy. + * Fix platform settings race condition and make auto-launch tri-state (https://github.com/element-hq/element-web/pull/30977). Contributed by @t3chguy. + * Fix: member count in header and member list (https://github.com/element-hq/element-web/pull/30982). Contributed by @florianduros. + * Fix duration of voice message in timeline (https://github.com/element-hq/element-web/pull/30973). Contributed by @florianduros. + * Fix voice notes rendering at 00:00 when playback had not begun. (https://github.com/element-hq/element-web/pull/30961). Contributed by @Half-Shot. + * Improve handling of animated images, add support for AVIF animations (https://github.com/element-hq/element-web/pull/30932). Contributed by @t3chguy. + * Update key storage toggle when key storage status changes (https://github.com/element-hq/element-web/pull/30934). Contributed by @uhoreg. + * Fix jitsi widget popout (https://github.com/element-hq/element-web/pull/30908). Contributed by @dbkr. + * Improve keyboard navigation on invite dialog (https://github.com/element-hq/element-web/pull/30930). Contributed by @florianduros. + * Prefer UIA flows with supported UIA stages (https://github.com/element-hq/element-web/pull/30926). Contributed by @richvdh. + * Enhance accessibility of dropdown (https://github.com/element-hq/element-web/pull/30928). Contributed by @florianduros. + * Improve accessibility of the `\ component (https://github.com/element-hq/element-web/pull/30907). Contributed by @MidhunSureshR. + + + +Version 1.12.1 + ## ✨ Features + + * New Room List: Change the order of filters to match those on mobile (https://github.com/element-hq/element-web/pull/30905). Contributed by @langleyd. + * New Room List: Don't clear filters on space change (https://github.com/element-hq/element-web/pull/30903). Contributed by @langleyd. + * Add release announcement for the sounds (https://github.com/element-hq/element-web/pull/30900). Contributed by @langleyd. + * Rich Text Editor: Add emoji suggestion support (https://github.com/element-hq/element-web/pull/30873). Contributed by @langleyd. + * feat: Disable session lock when running in element-desktop (https://github.com/element-hq/element-web/pull/30643). Contributed by @kaylendog. + * Improve invite dialog ui - Part 1 (https://github.com/element-hq/element-web/pull/30764). Contributed by @florianduros. + * Update Message Sound for Element (https://github.com/element-hq/element-web/pull/30804). Contributed by @beatdemon. + * Add new and improved ringtone (https://github.com/element-hq/element-web/pull/30761). Contributed by @Half-Shot. + * Disable RTE formatting buttons when the content contains a slash command (https://github.com/element-hq/element-web/pull/30802). Contributed by @langleyd. + + ## 🐛 Bug Fixes + + * New Room List: Improve robustness of keyboard navigation (https://github.com/element-hq/element-web/pull/30888). Contributed by @langleyd. + * Fix a11y issue on list in invite dialog (https://github.com/element-hq/element-web/pull/30878). Contributed by @florianduros. + * Switch Export and Import Icons to match intuition (https://github.com/element-hq/element-web/pull/30805). Contributed by @micartey. + * Hide breadcrumb option when new room list is enabled (https://github.com/element-hq/element-web/pull/30869). Contributed by @florianduros. + * Avoid creating multiple call objects for the same widget (https://github.com/element-hq/element-web/pull/30839). Contributed by @robintown. + * Add a test for #29882, which is fixed by matrix-org/matrix-js-sdk#5016 (https://github.com/element-hq/element-web/pull/30835). Contributed by @andybalaam. + * fix: use `help_encryption_url` of config instead of hardcoded `https://element.io/help#encryption5` (https://github.com/element-hq/element-web/pull/30746). Contributed by @florianduros. + * Fix html export when feature\_jump\_to\_date is enabled (https://github.com/element-hq/element-web/pull/30828). Contributed by @langleyd. + * Fix #30439: "Forgot recovery key" should go to "reset" (https://github.com/element-hq/element-web/pull/30771). Contributed by @andybalaam. + ------------------------------------------------------------------- Tue Sep 23 13:57:06 UTC 2025 - Dominik Heidler diff --git a/element-desktop.spec b/element-desktop.spec index aa283fa..cfccd7f 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -17,7 +17,7 @@ Name: element-desktop -Version: 1.12.0 +Version: 1.12.2 Release: 0 Summary: A glossy Matrix collaboration client - desktop License: AGPL-3.0-only OR GPL-3.0-only @@ -34,6 +34,7 @@ Patch3: remove-fuses.patch Patch4: no-walrus-operator.patch Patch5: break-esbuild-for-good.patch Patch6: fix-oxc-resolver.patch +Patch7: no-install-app-deps.patch BuildRequires: app-builder BuildRequires: cargo BuildRequires: element-web = %{version} @@ -78,9 +79,6 @@ A glossy Matrix collaboration client - desktop # of course this node garbage of a "programming language" is trying to copy around some windows specific stuff on linux echo > ./node_modules/electron-winstaller/script/select-7z-arch.js -# don't run the broken postinstall script -sed -i -e 's/^.*postinstall.*$/"foo":"bar"/' package.json - # https://blogs.gnome.org/mcatanzaro/2020/05/18/patching-vendored-rust-dependencies/ for i in cc libloading libsqlite3-sys openssl-src rustix seshat vcpkg; do pushd .hak/hakModules/matrix-seshat/vendor/$i @@ -224,7 +222,6 @@ grep -rlZ '#! \?/usr/bin/env' "%{buildroot}%{_datadir}/element/app/node_modules/ %fdupes %{buildroot}%{_datadir} %check -%electron_check_native %files %license LICENSE-AGPL-3.0 LICENSE-GPL-3.0 diff --git a/fix-oxc-resolver.patch b/fix-oxc-resolver.patch index e5ae0ca..166d383 100644 --- a/fix-oxc-resolver.patch +++ b/fix-oxc-resolver.patch @@ -5,7 +5,7 @@ diff -ru a/node_modules/oxc-resolver/package.json b/node_modules/oxc-resolver/pa "test": "vitest run -r ./napi", "build:debug": "napi build --platform --manifest-path napi/Cargo.toml", "build": "pnpm run build:debug --features allocator --release", -- "postinstall": "napi-postinstall oxc-resolver 11.7.1 check", +- "postinstall": "napi-postinstall oxc-resolver 11.8.4 check", "postbuild:debug": "node napi/patch.mjs" }, "dependencies": { diff --git a/no-install-app-deps.patch b/no-install-app-deps.patch new file mode 100644 index 0000000..c0389a8 --- /dev/null +++ b/no-install-app-deps.patch @@ -0,0 +1,11 @@ +--- element-desktop-1.12.2/package.json 2025-10-21 13:54:45.000000000 +0200 ++++ package.json 2025-10-22 12:29:04.532363323 +0200 +@@ -57,7 +57,7 @@ + "test:open": "yarn test --ui", + "test:screenshots:build": "docker build playwright -t element-desktop-playwright --platform linux/amd64", + "test:screenshots:run": "docker run --rm --network host -v $(pwd):/work/element-desktop -v /var/run/docker.sock:/var/run/docker.sock --platform linux/amd64 -it element-desktop-playwright", +- "postinstall": "patch-package && electron-builder install-app-deps" ++ "postinstall": "patch-package" + }, + "dependencies": { + "@sentry/electron": "^7.0.0", diff --git a/no-walrus-operator.patch b/no-walrus-operator.patch index c325bc3..44641a0 100644 --- a/no-walrus-operator.patch +++ b/no-walrus-operator.patch @@ -1,6 +1,6 @@ ---- foo/node_modules/node-gyp/gyp/pylib/gyp/common.py 2024-09-26 12:47:30.529999000 +0200 -+++ ./common.py 2024-09-26 22:52:44.247875969 +0200 -@@ -432,13 +432,17 @@ +--- foo/node_modules/node-gyp/gyp/pylib/gyp/common.py 2025-10-21 23:01:35.829999000 +0200 ++++ common.py 2025-10-22 11:49:43.867482064 +0200 +@@ -429,13 +429,17 @@ def replace_sep(s): return s.replace(os.sep, "/") if os.sep != "/" else s @@ -21,28 +21,4 @@ + if CXXFLAGS: cmd += shlex.split(replace_sep(CXXFLAGS)) else: - return {} ---- foo/node_modules/@electron/node-gyp/gyp/pylib/gyp/common.py 2024-09-26 12:47:30.529999000 +0200 -+++ ./common.py 2024-09-26 22:52:44.247875969 +0200 -@@ -432,13 +432,17 @@ - def replace_sep(s): - return s.replace(os.sep, "/") if os.sep != "/" else s - -- if CC := os.environ.get("CC_target") or os.environ.get("CC"): -+ CC = os.environ.get("CC_target") or os.environ.get("CC") -+ CXX = os.environ.get("CXX_target") or os.environ.get("CXX") -+ CFLAGS = os.environ.get("CFLAGS") -+ CXXFLAGS = os.environ.get("CXXFLAGS") -+ if CC: - cmd += shlex.split(replace_sep(CC)) -- if CFLAGS := os.environ.get("CFLAGS"): -+ if CFLAGS: - cmd += shlex.split(replace_sep(CFLAGS)) -- elif CXX := os.environ.get("CXX_target") or os.environ.get("CXX"): -+ elif CXX: - cmd += shlex.split(replace_sep(CXX)) -- if CXXFLAGS := os.environ.get("CXXFLAGS"): -+ if CXXFLAGS: - cmd += shlex.split(replace_sep(CXXFLAGS)) - else: - return {} + return defines diff --git a/prepare.sh b/prepare.sh index 87d2daa..ebc4c7e 100644 --- a/prepare.sh +++ b/prepare.sh @@ -16,10 +16,10 @@ tmpdir="$(mktemp -d)" #zypper install findutils file yarn cargo cargo-vendor-filterer moreutils jq version=$(grep "Version:" element-desktop.spec | awk '{print $2}') -osc rm -f element-web-*.tar.gz ||: -osc rm -f element-desktop-*.tar.gz ||: +git rm -f element-web-*.tar.gz ||: +git rm -f element-desktop-*.tar.gz ||: wget -c https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz -O element-desktop-${version}.tar.gz -osc add -f element-desktop-*.tar.gz +git add -f element-desktop-*.tar.gz cp element-desktop.spec "$tmpdir/" cd "$tmpdir" diff --git a/vendor.tar.zst b/vendor.tar.zst index 5979b8c..c2ff458 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0367182e203bce450869f3951af93826ca692e75249434ac26a6170e96a8b17 -size 45179374 +oid sha256:ee2971aa1c633cc0a22d29ef4d5e1e9ebc84f11e200bc720bfe8573e8881f98f +size 45359522 -- 2.51.1 From 928911d94206e4836f03cfaa66d246140291408af88f3df2127b57d3e25bb2a2 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Mon, 27 Oct 2025 14:23:12 +0100 Subject: [PATCH 2/2] Mention README.md as source to make factory-auto happy --- element-desktop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/element-desktop.spec b/element-desktop.spec index cfccd7f..ce5fb0f 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -27,6 +27,7 @@ Source2: vendor.tar.zst Source3: io.element.Element.desktop Source4: element-desktop.sh Source5: prepare.sh +Source6: README.md Patch0: hak-remove-devdependencies.patch Patch1: 7za-path.patch Patch2: cc-link-lib-no-static.patch -- 2.51.1