diff options
Diffstat (limited to 'editors/vscode/files')
24 files changed, 298 insertions, 69 deletions
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_checker_layersChecker.ts index 55aa891b281f..96e2a0540fc3 100644 --- a/editors/vscode/files/patch-build_lib_layersChecker.ts +++ b/editors/vscode/files/patch-build_checker_layersChecker.ts @@ -1,6 +1,6 @@ ---- build/lib/layersChecker.ts.orig 2025-05-07 12:32:30 UTC -+++ build/lib/layersChecker.ts -@@ -419,7 +419,7 @@ function createProgram(tsconfigPath: string): ts.Progr +--- build/checker/layersChecker.ts.orig 2025-07-12 04:56:20 UTC ++++ build/checker/layersChecker.ts +@@ -136,7 +136,7 @@ function createProgram(tsconfigPath: string): ts.Progr function createProgram(tsconfigPath: string): ts.Program { const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile); diff --git a/editors/vscode/files/patch-build_lib_electron.ts b/editors/vscode/files/patch-build_lib_electron.ts new file mode 100644 index 000000000000..c89cd63f67f6 --- /dev/null +++ b/editors/vscode/files/patch-build_lib_electron.ts @@ -0,0 +1,13 @@ +--- build/lib/electron.ts.orig 2025-07-09 22:00:36 UTC ++++ build/lib/electron.ts +@@ -199,8 +199,9 @@ export const config = { + winIcon: 'resources/win32/code.ico', + token: process.env['GITHUB_TOKEN'], + repo: product.electronRepository || undefined, +- validateChecksum: true, ++ validateChecksum: false, + checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'), ++ unsafelyDisableChecksums: true, + }; + + function getElectron(arch: string): () => NodeJS.ReadWriteStream { diff --git a/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts b/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts index 24851b7064a4..1d3e446974f1 100644 --- a/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts +++ b/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts @@ -1,6 +1,6 @@ ---- build/lib/propertyInitOrderChecker.ts.orig 2025-05-07 12:32:30 UTC +--- build/lib/propertyInitOrderChecker.ts.orig 2025-06-11 13:47:56 UTC +++ build/lib/propertyInitOrderChecker.ts -@@ -109,7 +109,7 @@ function createProgram(tsconfigPath: string): ts.Progr +@@ -36,7 +36,7 @@ function createProgram(tsconfigPath: string): ts.Progr function createProgram(tsconfigPath: string): ts.Program { const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile); diff --git a/editors/vscode/files/patch-build_lib_snapshotLoader.ts b/editors/vscode/files/patch-build_lib_snapshotLoader.ts index 2495de98ca7c..81cb08da4a47 100644 --- a/editors/vscode/files/patch-build_lib_snapshotLoader.ts +++ b/editors/vscode/files/patch-build_lib_snapshotLoader.ts @@ -1,11 +1,10 @@ ---- build/lib/snapshotLoader.ts.orig 2022-07-05 18:15:23 UTC +--- build/lib/snapshotLoader.ts.orig 2025-06-11 13:47:56 UTC +++ build/lib/snapshotLoader.ts -@@ -25,7 +25,7 @@ namespace snaps { - break; +@@ -26,6 +26,7 @@ export namespace snaps { case 'win32': -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`; startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`; break; diff --git a/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js new file mode 100644 index 000000000000..ff8ea52e2aa3 --- /dev/null +++ b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js @@ -0,0 +1,15 @@ +--- node_modules/@vscode/deviceid/dist/index.js.orig 2025-06-19 08:48:56 UTC ++++ node_modules/@vscode/deviceid/dist/index.js +@@ -20,8 +20,9 @@ if (process.platform !== "win32" && + Object.defineProperty(exports, "__esModule", { value: true }); + if (process.platform !== "win32" && + process.platform !== "darwin" && +- process.platform !== "linux") { ++ process.platform !== "linux" && ++ process.platform !== "freebsd") { + throw new Error("Unsupported platform"); + } + __exportStar(require("./devdeviceid.js"), exports); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map diff --git a/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js new file mode 100644 index 000000000000..544b9ab8a0a7 --- /dev/null +++ b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js @@ -0,0 +1,18 @@ +--- node_modules/@vscode/deviceid/dist/storage.js.orig 2025-06-19 08:49:17 UTC ++++ node_modules/@vscode/deviceid/dist/storage.js +@@ -42,7 +42,7 @@ function getDirectory() { + if (process.platform === "darwin") { + folder = path.join(process.env.HOME, "Library", "Application Support"); + } +- else if (process.platform === "linux") { ++ else if (process.platform === "linux" || process.platform === "freebsd") { + folder = + process.env.XDG_CACHE_HOME ?? path.join(process.env.HOME, ".cache"); + } +@@ -78,4 +78,4 @@ exports.setDeviceId = setDeviceId; + } + } + exports.setDeviceId = setDeviceId; +-//# sourceMappingURL=storage.js.map +\ No newline at end of file ++//# sourceMappingURL=storage.js.map diff --git a/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js new file mode 100644 index 000000000000..dc29d0c61156 --- /dev/null +++ b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js @@ -0,0 +1,10 @@ +--- node_modules/@vscode/gulp-electron/src/download.js.orig 2025-07-12 11:54:58 UTC ++++ node_modules/@vscode/gulp-electron/src/download.js +@@ -103,6 +103,7 @@ async function download(opts) { + artifactName: opts.artifactName, + artifactSuffix: opts.artifactSuffix, + token: opts.token, ++ unsafelyDisableChecksums: opts.unsafelyDisableChecksums, + downloadOptions: { + getProgressCallback: (progress) => { + if (bar) bar.update(progress.percent); diff --git a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp index df3fa94b1c68..98d1ff149173 100644 --- a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp @@ -1,6 +1,6 @@ ---- node_modules/kerberos/binding.gyp.orig 2024-09-09 06:45:52 UTC +--- node_modules/kerberos/binding.gyp.orig 2025-06-26 19:59:03 UTC +++ node_modules/kerberos/binding.gyp -@@ -54,7 +54,7 @@ +@@ -54,14 +54,14 @@ ] } }], @@ -9,3 +9,34 @@ 'sources': [ 'src/unix/base64.cc', 'src/unix/kerberos_gss.cc', + 'src/unix/kerberos_unix.cc' + ] + }], +- ['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', { ++ ['(OS=="mac" or OS=="linux" or OS=="freebsd") and (kerberos_use_rtld!="true")', { + 'link_settings': { + 'libraries': [ + '-lkrb5', +@@ -78,11 +78,21 @@ + }] + ] + }], +- ['(OS=="mac" or OS=="linux") and (kerberos_use_rtld=="true")', { ++ ['(OS=="mac" or OS=="linux" or OS=="freebsd") and (kerberos_use_rtld=="true")', { + 'defines': ['KERBEROS_USE_RTLD=1'], + 'link_settings': { + 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..4ee74c9e7851 --- /dev/null +++ b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:14:32 UTC ++++ node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ diff --git a/editors/vscode/files/patch-package.json b/editors/vscode/files/patch-package.json new file mode 100644 index 000000000000..c40a6ad34f03 --- /dev/null +++ b/editors/vscode/files/patch-package.json @@ -0,0 +1,14 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- package.json.orig 2025-08-20 15:13:53 UTC ++++ package.json +@@ -105,6 +105,7 @@ + "native-is-elevated": "0.7.0", + "native-keymap": "^3.3.5", + "native-watchdog": "^1.4.1", ++ "node-ovsx-sign": "^1.2.0", + "node-pty": "^1.1.0-beta33", + "open": "^10.1.2", + "tas-client-umd": "0.2.0", diff --git a/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js new file mode 100644 index 000000000000..7759e309ac2d --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js @@ -0,0 +1,15 @@ +--- remote/node_modules/@vscode/deviceid/dist/index.js.orig 2025-06-19 08:49:40 UTC ++++ remote/node_modules/@vscode/deviceid/dist/index.js +@@ -20,8 +20,9 @@ if (process.platform !== "win32" && + Object.defineProperty(exports, "__esModule", { value: true }); + if (process.platform !== "win32" && + process.platform !== "darwin" && +- process.platform !== "linux") { ++ process.platform !== "linux" && ++ process.platform !== "freebsd") { + throw new Error("Unsupported platform"); + } + __exportStar(require("./devdeviceid.js"), exports); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map diff --git a/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js new file mode 100644 index 000000000000..14c2e4690dd4 --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js @@ -0,0 +1,18 @@ +--- remote/node_modules/@vscode/deviceid/dist/storage.js.orig 2025-06-19 08:49:56 UTC ++++ remote/node_modules/@vscode/deviceid/dist/storage.js +@@ -42,7 +42,7 @@ function getDirectory() { + if (process.platform === "darwin") { + folder = path.join(process.env.HOME, "Library", "Application Support"); + } +- else if (process.platform === "linux") { ++ else if (process.platform === "linux" || process.platform === "freebsd") { + folder = + process.env.XDG_CACHE_HOME ?? path.join(process.env.HOME, ".cache"); + } +@@ -78,4 +78,4 @@ exports.setDeviceId = setDeviceId; + } + } + exports.setDeviceId = setDeviceId; +-//# sourceMappingURL=storage.js.map +\ No newline at end of file ++//# sourceMappingURL=storage.js.map diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp index aded5c65fd71..c45e3b1a359c 100644 --- a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp @@ -1,6 +1,6 @@ ---- remote/node_modules/kerberos/binding.gyp.orig 2024-09-09 06:45:52 UTC +--- remote/node_modules/kerberos/binding.gyp.orig 2025-06-26 20:01:28 UTC +++ remote/node_modules/kerberos/binding.gyp -@@ -54,7 +54,7 @@ +@@ -54,14 +54,14 @@ ] } }], @@ -9,3 +9,34 @@ 'sources': [ 'src/unix/base64.cc', 'src/unix/kerberos_gss.cc', + 'src/unix/kerberos_unix.cc' + ] + }], +- ['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', { ++ ['(OS=="mac" or OS=="linux" or OS=="freebsd") and (kerberos_use_rtld!="true")', { + 'link_settings': { + 'libraries': [ + '-lkrb5', +@@ -78,11 +78,21 @@ + }] + ] + }], +- ['(OS=="mac" or OS=="linux") and (kerberos_use_rtld=="true")', { ++ ['(OS=="mac" or OS=="linux" or OS=="freebsd") and (kerberos_use_rtld=="true")', { + 'defines': ['KERBEROS_USE_RTLD=1'], + 'link_settings': { + 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..be4c95e3d422 --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- remote/node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:17:25 UTC ++++ remote/node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ diff --git a/editors/vscode/files/patch-scripts_code-perf.js b/editors/vscode/files/patch-scripts_code-perf.js deleted file mode 100644 index 50a32a8d434a..000000000000 --- a/editors/vscode/files/patch-scripts_code-perf.js +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/code-perf.js.orig 2024-03-01 05:22:09 UTC -+++ scripts/code-perf.js -@@ -65,7 +65,7 @@ function getExePath(buildPath) { - case 'darwin': - relativeExePath = path.join('Contents', 'MacOS', 'Electron'); - break; -- case 'linux': { -+ case 'linux': case 'freebsd': { - const product = require(path.join(buildPath, 'resources', 'app', 'product.json')); - relativeExePath = product.applicationName; - break; diff --git a/editors/vscode/files/patch-src_vs_base_common_platform.ts b/editors/vscode/files/patch-src_vs_base_common_platform.ts index 69cd665fa3a2..e032caf7dbf1 100644 --- a/editors/vscode/files/patch-src_vs_base_common_platform.ts +++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts @@ -1,4 +1,4 @@ ---- src/vs/base/common/platform.ts.orig 2024-09-04 12:53:09 UTC +--- src/vs/base/common/platform.ts.orig 2025-08-06 20:09:28 UTC +++ src/vs/base/common/platform.ts @@ -74,7 +74,7 @@ if (typeof nodeProcess === 'object') { if (typeof nodeProcess === 'object') { @@ -8,7 +8,7 @@ + _isLinux = (nodeProcess.platform === 'linux' || nodeProcess.platform === 'freebsd'); _isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION']; _isElectron = isElectronProcess; - _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY']; + _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!nodeProcess.env['GITHUB_WORKSPACE']; @@ -100,7 +100,7 @@ else if (typeof navigator === 'object' && !isElectronR _isWindows = _userAgent.indexOf('Windows') >= 0; _isMacintosh = _userAgent.indexOf('Macintosh') >= 0; diff --git a/editors/vscode/files/patch-src_vs_base_node_ps.ts b/editors/vscode/files/patch-src_vs_base_node_ps.ts index 253ffa966084..3d0cdab9e6bf 100644 --- a/editors/vscode/files/patch-src_vs_base_node_ps.ts +++ b/editors/vscode/files/patch-src_vs_base_node_ps.ts @@ -1,20 +1,10 @@ ---- src/vs/base/node/ps.ts.orig 2024-01-31 22:36:21 UTC +--- src/vs/base/node/ps.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/base/node/ps.ts -@@ -208,7 +208,7 @@ export function listProcesses(rootPid: number): Promis - - exec('which ps', {}, (err, stdout, stderr) => { - if (err || stderr) { -- if (process.platform !== 'linux') { -+ if (process.platform !== 'linux' && process.platform !== 'freebsd') { - reject(err || new Error(stderr.toString())); - } else { - const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh').fsPath); -@@ -223,7 +223,8 @@ export function listProcesses(rootPid: number): Promis +@@ -225,7 +225,7 @@ export function listProcesses(rootPid: number): Promis } } else { const ps = stdout.toString().trim(); - const args = '-ax -o pid=,ppid=,pcpu=,pmem=,command='; -+ // const args = '-ax -o pid=,ppid=,pcpu=,pmem=,command='; + const args = '-ax -o pid= -o ppid= -o pcpu= -o pmem= -o command='; // Set numeric locale to ensure '.' is used as the decimal separator diff --git a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts index c9f26abc8701..023e708012a8 100644 --- a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts +++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts @@ -1,11 +1,10 @@ ---- src/vs/code/electron-main/app.ts.orig 2025-05-07 12:32:30 UTC +--- src/vs/code/electron-main/app.ts.orig 2025-06-23 07:50:00 UTC +++ src/vs/code/electron-main/app.ts -@@ -989,7 +989,7 @@ export class CodeApplication extends Disposable { - services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); +@@ -990,6 +990,7 @@ export class CodeApplication extends Disposable { break; -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': if (isLinuxSnap) { services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env['SNAP'], process.env['SNAP_REVISION']])); } else { diff --git a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts index 32e1d5fc0f4e..f7b469c06459 100644 --- a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts +++ b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts @@ -1,11 +1,10 @@ ---- src/vs/platform/environment/node/userDataPath.ts.orig 2024-11-05 12:18:19 UTC +--- src/vs/platform/environment/node/userDataPath.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/platform/environment/node/userDataPath.ts -@@ -76,7 +76,7 @@ function doGetUserDataPath(cliArgs: NativeParsedArgs, - case 'darwin': - appDataPath = path.join(os.homedir(), 'Library', 'Application Support'); +@@ -87,6 +87,7 @@ function doGetUserDataPath(cliArgs: NativeParsedArgs, + appDataPath = join(homedir(), 'Library', 'Application Support'); break; -- case 'linux': -+ case 'linux': case 'freebsd': - appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config'); + case 'linux': ++ case 'freebsd': + appDataPath = process.env['XDG_CONFIG_HOME'] || join(homedir(), '.config'); break; default: diff --git a/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts new file mode 100644 index 000000000000..b10a1adb8f06 --- /dev/null +++ b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts @@ -0,0 +1,47 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts.orig 2025-08-20 15:13:53 UTC ++++ src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts +@@ -35,7 +35,7 @@ declare module vsceSign { + } + + declare module vsceSign { +- export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<ExtensionSignatureVerificationResult>; ++ export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<boolean>; + } + + /** +@@ -67,7 +67,7 @@ export class ExtensionSignatureVerificationService imp + } + + private async resolveVsceSign(): Promise<typeof vsceSign> { +- const mod = '@vscode/vsce-sign'; ++ const mod = 'node-ovsx-sign'; + return import(mod); + } + +@@ -87,7 +87,21 @@ export class ExtensionSignatureVerificationService imp + + try { + this.logService.trace(`Verifying extension signature for ${extensionId}...`); +- result = await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ let isSignatureValid = ++ await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ if (isSignatureValid) { ++ result = { ++ code: ExtensionSignatureVerificationCode.Success, ++ didExecute: true, ++ output: "The extension signature is valid." ++ }; ++ } else { ++ result = { ++ code: ExtensionSignatureVerificationCode.SignatureIsNotValid, ++ didExecute: true, ++ output: "The extension signature is invalid." ++ }; ++ } + } catch (e) { + result = { + code: ExtensionSignatureVerificationCode.UnknownError, diff --git a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts index a645b7288214..0a8f39531ffe 100644 --- a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts +++ b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts @@ -1,11 +1,10 @@ ---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2025-04-09 23:39:47 UTC +--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/workbench/api/browser/mainThreadTask.ts -@@ -726,7 +726,7 @@ export class MainThreadTask extends Disposable impleme - case 'darwin': +@@ -727,6 +727,7 @@ export class MainThreadTask extends Disposable impleme platform = Platform.Platform.Mac; break; -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': platform = Platform.Platform.Linux; break; default: diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts index bfa7d3c484ad..d31d73e874d3 100644 --- a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts +++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts @@ -1,11 +1,14 @@ ---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-04-09 23:39:47 UTC +--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-08-06 20:09:28 UTC +++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts -@@ -1153,7 +1153,7 @@ class CommandsTableRenderer extends Disposable impleme +@@ -1172,7 +1172,10 @@ class CommandsTableRenderer extends Disposable impleme switch (platform) { case 'win32': key = rawKeyBinding.win; break; - case 'linux': key = rawKeyBinding.linux; break; -+ case 'linux': case 'freebsd': key = rawKeyBinding.linux; break; ++ case 'linux': ++ case 'freebsd': ++ key = rawKeyBinding.linux; ++ break; case 'darwin': key = rawKeyBinding.mac; break; } diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index 5278a38c8fc8..e3e4afbe21d0 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,20 +1,20 @@ ---- test/automation/src/electron.ts.orig 2025-05-07 12:32:30 UTC +--- test/automation/src/electron.ts.orig 2025-08-06 20:09:28 UTC +++ test/automation/src/electron.ts -@@ -84,7 +84,7 @@ export function getDevElectronPath(): string { - switch (process.platform) { +@@ -86,6 +86,7 @@ export function getDevElectronPath(): string { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -97,7 +97,7 @@ export function getBuildElectronPath(root: string): st +@@ -98,7 +99,8 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); - case 'linux': { -+ case 'linux': case 'freebsd': { ++ case 'linux': ++ case 'freebsd': { const product = require(join(root, 'resources', 'app', 'product.json')); return join(root, product.applicationName); } diff --git a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts index 806c996a9a00..82233b967353 100644 --- a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts +++ b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts @@ -1,4 +1,4 @@ ---- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-04-11 12:34:55 UTC +--- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-07-09 22:00:36 UTC +++ test/smoke/src/areas/terminal/terminal.test.ts @@ -39,15 +39,15 @@ export function setup(logger: Logger) { // https://github.com/microsoft/vscode/issues/216564 @@ -10,14 +10,13 @@ - setupTerminalProfileTests({ skipSuite: process.platform === 'linux' }); - setupTerminalTabsTests({ skipSuite: process.platform === 'linux' }); - setupTerminalShellIntegrationTests({ skipSuite: process.platform === 'linux' }); -- setupTerminalStickyScrollTests({ skipSuite: process.platform === 'linux' }); + setupTerminalEditorsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalInputTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalPersistenceTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalProfileTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalTabsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalShellIntegrationTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); -+ setupTerminalStickyScrollTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') }); + setupTerminalStickyScrollTests({ skipSuite: true }); // https://github.com/microsoft/vscode/pull/141974 // Windows is skipped here as well as it was never enabled from the start - setupTerminalSplitCwdTests({ skipSuite: process.platform === 'linux' || process.platform === 'win32' }); |