























@Edu4rdSHL can you please apply the patch from my last commit (just adding the sed command). Thanks!
To fix the breaking build:
diff --git a/PKGBUILD b/PKGBUILD
index 7628fe5..5b42f21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -75,6 +75,9 @@ prepare() {
# Upgrade electron-builder so we do not need fpm installed locally when building on aarch64
sed -i 's/"electron-builder": "26\.0\.14",/"electron-builder": "26.0.20",/' package.json
+ # dmg-builder 26.0.20 changed vendor/dmgbuild/core.py; the stale macOS-only
+ # background bookmark hunk is not needed for this Linux package.
+ sed -i '/^diff --git a\/vendor\/dmgbuild\/core.py/,$d' patches/dmg-builder.patch
# Install dependencies for sticker-creator
pnpm install -C ./sticker-creator/
The breaking change was caused by https://github.com/signalapp/Signal-Desktop/commit/54dd1261f839cb1bfb592dbc50a817ca83e69925 which sets "ignorePatchFailures": false
The core.py hunk is not needed for this Linux package. It patches macOS DMG background bookmark code, and dmg-builder@26.0.20 moved that code enough that the old hunk no longer applies.
Also opened a merge request for stable: https://gitlab.archlinux.org/archlinux/packaging/packages/signal-desktop/-/merge_requests/11
I have a problem with the current version (using aarch64):
Done in 2.5s using pnpm v10.18.1
Scope: all 3 workspace projects
WARN 18 deprecated subdependencies found: @npmcli/move-file@2.0.1, @xmldom/xmldom@0.8.10, boolean@3.2.0, deep-diff@0.3.8, expect-playwright@0.8.0, glob@10.5.0, glob@7.2.3, glob@8.1.0, inflight@1.0.6, jest-playwright-preset@4.0.0, jest-process-manager@0.4.0, lodash.isequal@4.5.0, node-domexception@1.0.0, rimraf@2.6.3, rimraf@3.0.2, tar@6.2.1, tar@7.5.2, whatwg-encoding@2.0.0
Packages: +1878
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Progress: resolved 2107, reused 1893, downloaded 0, added 1878, done
ERR_PNPM_PATCH_FAILED Could not apply patch /home/sushi/tools/signal-desktop-beta/src/Signal-Desktop-8.11.0-beta.1/patches/dmg-builder.patch to /home/sushi/tools/signal-desktop-beta/src/Signal-Desktop-8.11.0-beta.1/node_modules/.pnpm/dmg-builder@26.0.20_patch_hash=7ce1df215d2c4dcbe797485ec0456168d19a4870687b21c489062abd_16c4d23ecd88b27ec5ed7193de2d1f74/node_modules/dmg-builder
==> ERROR: A failure occurred in prepare().
Aborting...
Is there any workaround for this?
Hi @mkurz, I have been a bit busy. I will be adding your fix in the next pkgver bump or in the next days, thanks!
Hey @Edu4rdSHL I rebased my branch, see my last comment. If you could merge that that would be really really great for us aarch64 users. Thanks!
Thank you very much @Edu4rdSHL, it works!
Hi, @mkurz. Implemented in 7.85.0beta1-2.
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。
The problem is actually caused by the aarch64
sedthat we added a time ago. I'm not going to add another bandaid for aarch64 again, as this package is mainly made for x86-64 users.To not break aarch64 completely, I have reverted to the
USE_SYSTEM_FPMbehavior, which should keep the build working, and removed theelectron-buildersed.Please keep complaints about dependency version upgrades on the upstream repo.