timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-21 18:40:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.104): update patches (#2486)

Browse Source
This commit is contained in:
Baptiste Augrain
2025-08-31 09:58:04 +02:00
committed by GitHub
parent 0545b56f6f
commit 471a81e89f
7 changed files with 175 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/linux/fix-build.patch
View File

@@ -1,19 +1,19 @@
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 1dfaeb3..c5ff6d3 100644
index b544223..e9063ec 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -27,3 +27,3 @@ const product = require("../../product.json");
// are valid, are in dep-lists.ts
-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:chrome/installer/linux/BUILD.gn;l=64-80
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:chrome/installer/linux/BUILD.gn;l=64-80
@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
// Add the tunnel binary.
- files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
+ // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
// Add the main executable.
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 1aab03f..ec859f1 100644
index 00d7bc6..a5e256c 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -25,3 +25,3 @@ import product = require('../../product.json');

35
patches/linux/fix-reh-bootstrap.patch
View File

@@ -1,25 +1,42 @@
diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
index 188a25a..12b262d 100644
index c4a55e6..7285051 100644
--- a/src/bootstrap-esm.ts
+++ b/src/bootstrap-esm.ts
@@ -6,3 +6,3 @@
import * as fs from 'fs';
-import { createRequire, register } from 'node:module';
-import { register } from 'node:module';
+import * as Module from 'node:module';
import { product, pkg } from './bootstrap-meta.js';
@@ -12,6 +12,7 @@ import { INLSConfiguration } from './vs/nls.js';
-const require = createRequire(import.meta.url);
+const require = Module.createRequire(import.meta.url);
@@ -13,3 +13,3 @@ import { INLSConfiguration } from './vs/nls.js';
// Install a hook to module resolution to map 'fs' to 'original-fs'
-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+// @ts-ignore
+if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
const jsCode = `
@@ -30,3 +31,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
@@ -28,3 +28,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
}`;
- register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+ // @ts-ignore
+ Module.register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
}
diff --git a/src/bootstrap-esm.ts.rej b/src/bootstrap-esm.ts.rej
new file mode 100644
index 0000000..df9a975
--- /dev/null
+++ b/src/bootstrap-esm.ts.rej
@@ -0,0 +1,16 @@
+diff a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts (rejected hunks)
+@@ -6,3 +6,3 @@
+ import * as fs from 'fs';
+-import { createRequire, register } from 'node:module';
++import * as Module from 'node:module';
+ import { product, pkg } from './bootstrap-meta.js';
+@@ -12,6 +12,7 @@ import { INLSConfiguration } from './vs/nls.js';
+
+-const require = createRequire(import.meta.url);
++const require = Module.createRequire(import.meta.url);
+
+ // Install a hook to module resolution to map 'fs' to 'original-fs'
+-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
++// @ts-ignore
++if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
+ const jsCode = `