From ba77ef756376c17e153a0af18e878f3026186b7b Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:24:29 -0700 Subject: [PATCH] Fix build on macOS --- package-lock.json | 26 -------------------------- package.json | 1 - patches/dmg-builder+24.13.3.patch | 13 +++++++++++++ 3 files changed, 13 insertions(+), 27 deletions(-) create mode 100644 patches/dmg-builder+24.13.3.patch diff --git a/package-lock.json b/package-lock.json index c38d92350247..2357830d5f32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19110,32 +19110,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/dmg-license": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.0.tgz", - "integrity": "sha512-61a1BbbDkx0SXcB8F1V/08mOcIcqeaLJukJQvessOcHdqbaGIq9yOimX+wr6YTSpHLjsOaNuFP5fm5gdKz0qnQ==", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "ajv": "^6.10.0", - "cli-truncate": "^1.1.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.1", - "plist": "^3.0.1", - "smart-buffer": "^4.0.2", - "verror": "^1.10.0" - }, - "bin": { - "dmg-license": "bin/dmg-license.js" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", diff --git a/package.json b/package.json index 7cc8fd31f253..cb41f869aec6 100644 --- a/package.json +++ b/package.json @@ -353,7 +353,6 @@ }, "@types/react": "17.0.45", "@types/react-dom": "17.0.17", - "dmg-license": "$nop", "fabric": { "canvas": "$nop", "jsdom": "$nop" }, "fast-glob": { "glob-parent": "5.1.2" }, "read-last-lines": { "mz": { "thenify-all": { "thenify": "3.3.1" } } } diff --git a/patches/dmg-builder+24.13.3.patch b/patches/dmg-builder+24.13.3.patch new file mode 100644 index 000000000000..b97312ce4c76 --- /dev/null +++ b/patches/dmg-builder+24.13.3.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/dmg-builder/out/dmgLicense.js b/node_modules/dmg-builder/out/dmgLicense.js +index b91be7d..dad9ceb 100644 +--- a/node_modules/dmg-builder/out/dmgLicense.js ++++ b/node_modules/dmg-builder/out/dmgLicense.js +@@ -6,7 +6,7 @@ const js_yaml_1 = require("js-yaml"); + const license_1 = require("app-builder-lib/out/util/license"); + const fs_extra_1 = require("fs-extra"); + const licenseButtons_1 = require("./licenseButtons"); +-const dmg_license_1 = require("dmg-license"); ++// SIGNAL: const dmg_license_1 = require("dmg-license"); + async function addLicenseToDmg(packager, dmgPath) { + const licenseFiles = await (0, license_1.getLicenseFiles)(packager); + if (licenseFiles.length === 0) {