mirror of
https://github.com/element-hq/element-desktop.git
synced 2026-01-20 21:38:06 -05:00
Compare commits
8 Commits
develop
...
t3chguy/ma
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8237537c0 | ||
|
|
ac894dad4b | ||
|
|
df188fdd43 | ||
|
|
62d1dca2e7 | ||
|
|
6408d82483 | ||
|
|
80e4e34091 | ||
|
|
6afeba0d39 | ||
|
|
781d29c51c |
4
.github/workflows/build_macos.yaml
vendored
4
.github/workflows/build_macos.yaml
vendored
@@ -109,6 +109,10 @@ jobs:
|
||||
with:
|
||||
python-version: "3.13"
|
||||
|
||||
# Install Quartz for DMG badges
|
||||
# https://github.com/electron-userland/electron-builder/issues/9511#issuecomment-3774092888
|
||||
- run: sudo pip3 install pyobjc-framework-Quartz
|
||||
|
||||
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
|
||||
with:
|
||||
node-version-file: .node-version
|
||||
|
||||
@@ -162,6 +162,9 @@ const config: Omit<Writable<Configuration>, "electronFuses"> & {
|
||||
mergeASARs: true,
|
||||
x64ArchFiles: "**/matrix-seshat/*.node", // hak already runs lipo
|
||||
},
|
||||
dmg: {
|
||||
badgeIcon: "build/icon.icon",
|
||||
},
|
||||
win: {
|
||||
target: ["squirrel", "msi"],
|
||||
signtoolOptions: {
|
||||
|
||||
10
package.json
10
package.json
@@ -85,12 +85,12 @@
|
||||
"@types/pacote": "^11.1.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
||||
"@typescript-eslint/parser": "^8.0.0",
|
||||
"app-builder-lib": "26.4.0",
|
||||
"app-builder-lib": "26.5.0",
|
||||
"chokidar": "^5.0.0",
|
||||
"detect-libc": "^2.0.0",
|
||||
"electron": "40.0.0",
|
||||
"electron-builder": "26.4.0",
|
||||
"electron-builder-squirrel-windows": "26.4.0",
|
||||
"electron-builder": "26.5.0",
|
||||
"electron-builder-squirrel-windows": "26.5.0",
|
||||
"electron-devtools-installer": "^4.0.0",
|
||||
"eslint": "^8.26.0",
|
||||
"eslint-config-google": "^0.14.0",
|
||||
@@ -118,10 +118,10 @@
|
||||
"matrix-seshat": "^4.0.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"atomically": "2.1.0",
|
||||
"atomically": "2.0.5",
|
||||
"@types/node": "18.19.130",
|
||||
"config-file-ts": "0.2.8-rc1",
|
||||
"node-abi": "4.25.0",
|
||||
"node-abi": "4.24.0",
|
||||
"@types/pg-pool": "2.0.7"
|
||||
}
|
||||
}
|
||||
|
||||
29
patches/dmg-builder+26.5.0.patch
Normal file
29
patches/dmg-builder+26.5.0.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
diff --git a/node_modules/dmg-builder/out/dmgUtil.js b/node_modules/dmg-builder/out/dmgUtil.js
|
||||
index acf576a..c306492 100644
|
||||
--- a/node_modules/dmg-builder/out/dmgUtil.js
|
||||
+++ b/node_modules/dmg-builder/out/dmgUtil.js
|
||||
@@ -99,7 +99,6 @@ async function customizeDmg({ appPath, artifactPath, volumeName, specification,
|
||||
const settings = {
|
||||
title: path.basename(volumePath),
|
||||
icon: await packager.getResource(specification.icon),
|
||||
- "badge-icon": await packager.getResource(specification.badgeIcon),
|
||||
"icon-size": specification.iconSize,
|
||||
"text-size": iconTextSize,
|
||||
"compression-level": Number(process.env.ELECTRON_BUILDER_COMPRESSION_LEVEL || "9"),
|
||||
@@ -114,6 +113,16 @@ async function customizeDmg({ appPath, artifactPath, volumeName, specification,
|
||||
// hide_extension: c.hideExtension,
|
||||
}))) || [],
|
||||
};
|
||||
+
|
||||
+ if (specification.badgeIcon) {
|
||||
+ let badgeIcon = await packager.getResource(specification.badgeIcon);
|
||||
+ if (badgeIcon.toLowerCase().endsWith(".icon")) {
|
||||
+ badgeIcon = await packager.generateIcnsFromIcon(badgeIcon)
|
||||
+ }
|
||||
+ settings["badge-icon"] = badgeIcon;
|
||||
+ delete settings["icon"];
|
||||
+ }
|
||||
+
|
||||
if (specification.backgroundColor != null || specification.background == null) {
|
||||
settings["background-color"] = specification.backgroundColor || "#ffffff";
|
||||
const window = specification.window;
|
||||
Reference in New Issue
Block a user