aboutsummaryrefslogtreecommitdiff
path: root/editors/vscode/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vscode/files')
-rw-r--r--editors/vscode/files/patch-build_checker_layersChecker.ts (renamed from editors/vscode/files/patch-build_lib_layersChecker.ts)6
-rw-r--r--editors/vscode/files/patch-build_lib_electron.ts13
-rw-r--r--editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js10
-rw-r--r--editors/vscode/files/patch-node__modules_kerberos_binding.gyp18
-rw-r--r--editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc20
-rw-r--r--editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp18
-rw-r--r--editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc20
-rw-r--r--editors/vscode/files/patch-src_vs_code_electron-main_app.ts10
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts4
-rw-r--r--editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts5
10 files changed, 112 insertions, 12 deletions
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_checker_layersChecker.ts
index 5f572328ac0a..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-06-11 13:47:56 UTC
-+++ build/lib/layersChecker.ts
-@@ -363,7 +363,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-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 8d5f1b08f7db..98d1ff149173 100644
--- a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp
+++ b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp
@@ -1,4 +1,4 @@
---- node_modules/kerberos/binding.gyp.orig 2025-06-12 22:34:24 UTC
+--- node_modules/kerberos/binding.gyp.orig 2025-06-26 19:59:03 UTC
+++ node_modules/kerberos/binding.gyp
@@ -54,14 +54,14 @@
]
@@ -17,7 +17,7 @@
'link_settings': {
'libraries': [
'-lkrb5',
-@@ -78,7 +78,7 @@
+@@ -78,11 +78,21 @@
}]
]
}],
@@ -26,3 +26,17 @@
'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-remote_node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp
index 6f7857f33b31..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,4 +1,4 @@
---- remote/node_modules/kerberos/binding.gyp.orig 2025-06-12 22:38:39 UTC
+--- remote/node_modules/kerberos/binding.gyp.orig 2025-06-26 20:01:28 UTC
+++ remote/node_modules/kerberos/binding.gyp
@@ -54,14 +54,14 @@
]
@@ -17,7 +17,7 @@
'link_settings': {
'libraries': [
'-lkrb5',
-@@ -78,7 +78,7 @@
+@@ -78,11 +78,21 @@
}]
]
}],
@@ -26,3 +26,17 @@
'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-src_vs_code_electron-main_app.ts b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
new file mode 100644
index 000000000000..023e708012a8
--- /dev/null
+++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
@@ -0,0 +1,10 @@
+--- src/vs/code/electron-main/app.ts.orig 2025-06-23 07:50:00 UTC
++++ src/vs/code/electron-main/app.ts
+@@ -990,6 +990,7 @@ export class CodeApplication extends Disposable {
+ break;
+
+ 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_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
index 7f52910c6fbe..efeed8cb2bfd 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,6 +1,6 @@
---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-06-11 13:47:56 UTC
+--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-07-09 22:00:36 UTC
+++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts
-@@ -1153,7 +1153,10 @@ class CommandsTableRenderer extends Disposable impleme
+@@ -1174,7 +1174,10 @@ class CommandsTableRenderer extends Disposable impleme
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;
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' });
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 08:14:38 +0000