mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-07-09 14:54:10 +01:00
Update electron-builder to 26.11.1
This commit is contained in:
+7
-6
@@ -237,7 +237,7 @@
|
||||
"direction": "2.0.1",
|
||||
"dom-accessibility-api": "0.7.1",
|
||||
"electron": "42.3.0",
|
||||
"electron-builder": "26.0.14",
|
||||
"electron-builder": "26.11.1",
|
||||
"electron-mocha": "13.1.0",
|
||||
"emoji-regex-xs": "2.0.1",
|
||||
"enhanced-resolve": "5.21.3",
|
||||
@@ -357,15 +357,16 @@
|
||||
"fabric@4.6.0": "patches/fabric+4.6.0.patch",
|
||||
"@vitest/expect@2.0.5": "patches/@vitest+expect+2.0.5.patch",
|
||||
"growing-file@0.1.3": "patches/growing-file+0.1.3.patch",
|
||||
"app-builder-lib": "patches/app-builder-lib.patch",
|
||||
"dmg-builder": "patches/dmg-builder.patch",
|
||||
"fs-xattr": "patches/fs-xattr.patch",
|
||||
"@types/chai": "patches/@types__chai.patch",
|
||||
"@napi-rs/canvas@0.1.61": "patches/@napi-rs__canvas@0.1.61.patch",
|
||||
"playwright-core": "patches/playwright-core.patch",
|
||||
"tsx": "patches/tsx.patch",
|
||||
"node-fetch@3.3.2": "patches/node-fetch@3.3.2.patch",
|
||||
"zod@4.3.6": "patches/zod@4.3.6.patch"
|
||||
"zod@4.3.6": "patches/zod@4.3.6.patch",
|
||||
"dmg-builder": "patches/dmg-builder.patch",
|
||||
"app-builder-lib": "patches/app-builder-lib.patch",
|
||||
"@electron/universal": "patches/@electron__universal.patch"
|
||||
},
|
||||
"onlyBuiltDependencies": [
|
||||
"@indutny/mac-screen-share",
|
||||
@@ -510,12 +511,12 @@
|
||||
"customNsisBinary": {
|
||||
"url": "https://updates.signal.org/desktop/nsis/nsis-3.0.4.1.7z",
|
||||
"version": "3.0.4.1-signal",
|
||||
"checksum": "D6XH03F8A4Vzfjpq6zS9eZYXGXktdoaeQh5QgxAZ01pdts3KaDfMilem0x+HUzn9FpzfpgZrD8MVTcFlcPfcWg=="
|
||||
"checksum": "822a421e2b8cfc66fc586128a5976818c1af24453ee05f5aa4faea21504b7036"
|
||||
},
|
||||
"customNsisResources": {
|
||||
"url": "https://updates.signal.org/desktop/nsis/nsis-resources-3.4.1.7z",
|
||||
"version": "3.4.1-signal",
|
||||
"checksum": "KmySC53iz92XNYVgEy5gc0/cpXiyWsxxOX5UETBAt889TIvsNlUx7uKBxkQVf3D2Ycex0D2IPGjRdGYr1bftrw=="
|
||||
"checksum": "161c900098cadd1da1e5e87f339909269d58b00bda788a7c1fb67441ecfd15e6"
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,8 +1,8 @@
|
||||
diff --git a/out/asar/asarUtil.js b/out/asar/asarUtil.js
|
||||
index bea8a3b1b2ab56d99ea3679eb88aaf0b4b646803..622e362315642a7144021bbb885e571e9e948e07 100644
|
||||
index ffb85dea810257c8ddbed2f857c25787c9e5b694..fdcc65fb94bcf95adbb4cf97b7d4c85a8fce5883 100644
|
||||
--- a/out/asar/asarUtil.js
|
||||
+++ b/out/asar/asarUtil.js
|
||||
@@ -149,15 +149,24 @@ class AsarPackager {
|
||||
@@ -212,15 +212,24 @@ class AsarPackager {
|
||||
if (a === b) {
|
||||
return 0;
|
||||
}
|
||||
@@ -32,7 +32,7 @@ index bea8a3b1b2ab56d99ea3679eb88aaf0b4b646803..622e362315642a7144021bbb885e571e
|
||||
return a < b ? -1 : 1;
|
||||
});
|
||||
diff --git a/out/targets/FpmTarget.js b/out/targets/FpmTarget.js
|
||||
index 47e6f48fcbed88b6ac07cff15c888c1b8b59721f..76dd6cc7265054222f2d70c76aa8456d550f29d1 100644
|
||||
index f10f8148a237fae6c7af44818a127dfc881d884f..3bc2a9d1895d4f00133c82240ec2eba8c87d605a 100644
|
||||
--- a/out/targets/FpmTarget.js
|
||||
+++ b/out/targets/FpmTarget.js
|
||||
@@ -30,6 +30,7 @@ class FpmTarget extends core_1.Target {
|
||||
@@ -44,7 +44,7 @@ index 47e6f48fcbed88b6ac07cff15c888c1b8b59721f..76dd6cc7265054222f2d70c76aa8456d
|
||||
productFilename: packager.appInfo.productFilename,
|
||||
...packager.platformSpecificBuildOptions,
|
||||
diff --git a/templates/linux/after-install.tpl b/templates/linux/after-install.tpl
|
||||
index 6cf860bd2847bae35ca8885cb680dd6c8c516e39..a3cb08a6dc7970ab2b32c731f41ea6e471204a19 100644
|
||||
index 2bb3d32d9df96a4bf0245670613f20459b32fb46..6dda2f3798ec0b13366f1b8d4adb9cd61696fd28 100644
|
||||
--- a/templates/linux/after-install.tpl
|
||||
+++ b/templates/linux/after-install.tpl
|
||||
@@ -55,3 +55,26 @@ if apparmor_status --enabled > /dev/null 2>&1; then
|
||||
@@ -75,7 +75,7 @@ index 6cf860bd2847bae35ca8885cb680dd6c8c516e39..a3cb08a6dc7970ab2b32c731f41ea6e4
|
||||
+
|
||||
+# SIGNAL CHANGES END
|
||||
diff --git a/templates/linux/after-remove.tpl b/templates/linux/after-remove.tpl
|
||||
index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..b5011d1b8cdb741ba6453f942a3c0660b66d41a0 100644
|
||||
index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..fa1ecd2d991977c53a5082b2efb3120c53211f13 100644
|
||||
--- a/templates/linux/after-remove.tpl
|
||||
+++ b/templates/linux/after-remove.tpl
|
||||
@@ -13,3 +13,12 @@ APPARMOR_PROFILE_DEST='/etc/apparmor.d/${executable}'
|
||||
@@ -91,9 +91,8 @@ index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..b5011d1b8cdb741ba6453f942a3c0660
|
||||
+fi
|
||||
+
|
||||
+# SIGNAL CHANGES END
|
||||
\ No newline at end of file
|
||||
diff --git a/templates/nsis/include/installer.nsh b/templates/nsis/include/installer.nsh
|
||||
index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882ed142fc8 100644
|
||||
index 300ef3dd699d0f5a081b1934fcc22dbe12025bdb..e1fc5bc630d2c3697bb1b51ddedf830a8f6418a5 100644
|
||||
--- a/templates/nsis/include/installer.nsh
|
||||
+++ b/templates/nsis/include/installer.nsh
|
||||
@@ -90,7 +90,13 @@
|
||||
@@ -112,10 +111,10 @@ index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882
|
||||
SetShellVarContext all
|
||||
${endif}
|
||||
diff --git a/templates/nsis/installSection.nsh b/templates/nsis/installSection.nsh
|
||||
index 053772f55ca6ece52f0a34c4fa0f05c9a5f07bd2..a58ea8c19116f8ec3fb7515ec4104282f635ecc8 100644
|
||||
index 053772f55ca6ece52f0a34c4fa0f05c9a5f07bd2..051bdafdb4aef45b0787fb3de1415d4a17c92ebf 100644
|
||||
--- a/templates/nsis/installSection.nsh
|
||||
+++ b/templates/nsis/installSection.nsh
|
||||
@@ -22,11 +22,37 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
|
||||
@@ -22,10 +22,37 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
|
||||
SpiderBanner::Show /MODERN
|
||||
!endif
|
||||
|
||||
@@ -124,7 +123,7 @@ index 053772f55ca6ece52f0a34c4fa0f05c9a5f07bd2..a58ea8c19116f8ec3fb7515ec4104282
|
||||
FindWindow $0 "#32770" "" $hwndparent $0
|
||||
- GetDlgItem $0 $0 1000
|
||||
- SendMessage $0 ${WM_SETTEXT} 0 "STR:$(installing)"
|
||||
|
||||
+
|
||||
+ GetDlgItem $1 $0 1000
|
||||
+ SendMessage $1 ${WM_SETTEXT} 0 "STR:$(installing)"
|
||||
+
|
||||
@@ -152,6 +151,6 @@ index 053772f55ca6ece52f0a34c4fa0f05c9a5f07bd2..a58ea8c19116f8ec3fb7515ec4104282
|
||||
+ GetDlgItem $1 $0 1025
|
||||
+ SendMessage $1 ${STM_SETIMAGE} ${IMAGE_ICON} $2
|
||||
+ !endif
|
||||
|
||||
StrCpy $1 $hwndparent
|
||||
System::Call 'user32::ShutdownBlockReasonCreate(${SYSTYPE_PTR}r1, w "$(installing)")'
|
||||
${endif}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/out/dmgLicense.js b/out/dmgLicense.js
|
||||
index cf1dbdf803d3af37e439c7f0fa219b497f8faaef..d546a96a2857c11e70c6489b33c87a7665399fd7 100644
|
||||
index d58b72f1f6e8009fa7c984d0aa43e7d6e2c0358e..4cff1dffabc835a2c046aaaf278a1208f0475c97 100644
|
||||
--- a/out/dmgLicense.js
|
||||
+++ b/out/dmgLicense.js
|
||||
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
||||
@@ -11,16 +11,3 @@ index cf1dbdf803d3af37e439c7f0fa219b497f8faaef..d546a96a2857c11e70c6489b33c87a76
|
||||
const fs_extra_1 = require("fs-extra");
|
||||
const js_yaml_1 = require("js-yaml");
|
||||
const licenseButtons_1 = require("./licenseButtons");
|
||||
diff --git a/vendor/dmgbuild/core.py b/vendor/dmgbuild/core.py
|
||||
index 1adc35289fc604f3dd5545d3d86fbacb6baeaf69..473e70a3a7a4e9285517634a0749d9da82211699 100644
|
||||
--- a/vendor/dmgbuild/core.py
|
||||
+++ b/vendor/dmgbuild/core.py
|
||||
@@ -255,7 +255,7 @@ def build_dmg():
|
||||
icvp['backgroundColorBlue'] = float(c.b)
|
||||
elif background_file:
|
||||
alias = Alias.for_file(background_file)
|
||||
- background_bmk = Bookmark.for_file(background_file)
|
||||
+ # background_bmk = Bookmark.for_file(background_file)
|
||||
|
||||
icvp['backgroundType'] = 2
|
||||
icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
|
||||
|
||||
Generated
+257
-370
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user