forked from pool/element-desktop
Dominik Heidler
00c3f7aae2
- Use bundled sqlcipher to work around symbol collision through mozilla-nss (gh#sqlcipher/sqlcipher#385) - Ship app unpacked instead of using asar - Remove development-only files that should not be shipped (bsc#1224133) - prepare.sh: * Ship dependencies as node_modules tree for patching possibility (yarn offline does not support patching) * Work around non-reproducible hakModules dependencies (gh#element-hq/element-desktop#1634) (hak-remove-devdependencies.patch) * Remove non-free binaries from archive * Remove vendored openssl copy from archive * Put everything into one archive - Use correct CFLAGS and RUSTFLAGS * add cc-link-lib-no-static.patch - Fix various build errors with electron-builder * 7za-path.patch * remove-fuses.patch - BuildRequire app-builder instead of using a non-free binary - Add standard Electron module load %check - Clean up unneeded BuildRequires - Drop unused electron-web source copy - Fix build error on ix86 and arm - Fix unresolvable build on Fedora OBS-URL: https://build.opensuse.org/request/show/1174684 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=58
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
hak fetch tries to download devDependencies for two modules. Unfortunately it does so in a very non-deterministic manner (no shrinkwrap file)
|
|
Remove that step since the devDependencies are not actually needed for any of these two modules.
|
|
|
|
--- element-desktop-1.11.65/scripts/hak/fetch.ts.orig 2024-04-23 15:14:00.000000000 +0200
|
|
+++ element-desktop-1.11.65/scripts/hak/fetch.ts 2024-05-15 19:40:21.779432272 +0200
|
|
@@ -35,23 +35,6 @@ export default async function fetch(hakE
|
|
console.log("Fetching " + moduleInfo.name + "@" + moduleInfo.version);
|
|
|
|
const packumentCache = new Map();
|
|
- await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleBuildDir, {
|
|
- packumentCache,
|
|
- });
|
|
-
|
|
- console.log("Running yarn install in " + moduleInfo.moduleBuildDir);
|
|
- await new Promise<void>((resolve, reject) => {
|
|
- const proc = childProcess.spawn(hakEnv.isWin() ? "yarn.cmd" : "yarn", ["install", "--ignore-scripts"], {
|
|
- stdio: "inherit",
|
|
- cwd: moduleInfo.moduleBuildDir,
|
|
- // We need shell mode on Windows to be able to launch `.cmd` executables
|
|
- // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
|
|
- shell: hakEnv.isWin(),
|
|
- });
|
|
- proc.on("exit", (code) => {
|
|
- code ? reject(code) : resolve();
|
|
- });
|
|
- });
|
|
|
|
// also extract another copy to the output directory at this point
|
|
// nb. we do not yarn install in the output copy: we could install in
|