diff options
Diffstat (limited to 'editors/vscode/files')
13 files changed, 110 insertions, 28 deletions
diff --git a/editors/vscode/files/node_modules/patch-extensions_node__modules__at_parcel_watcher_binding.gyp b/editors/vscode/files/node_modules/patch-extensions_node__modules__at_parcel_watcher_binding.gyp new file mode 100644 index 000000000000..6f5b9d8862d7 --- /dev/null +++ b/editors/vscode/files/node_modules/patch-extensions_node__modules__at_parcel_watcher_binding.gyp @@ -0,0 +1,23 @@ +--- extensions/node_modules/@parcel/watcher/binding.gyp.orig 2023-05-05 08:51:33 UTC ++++ extensions/node_modules/@parcel/watcher/binding.gyp +@@ -34,7 +34,7 @@ + "ARCHS": ["arm64"] + } + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + "sources": [ + "src/watchman/BSER.cc", + "src/watchman/WatchmanBackend.cc", +@@ -46,6 +46,11 @@ + "WATCHMAN", + "INOTIFY", + "BRUTE_FORCE" ++ ] ++ }], ++ ['OS=="freebsd"', { ++ "libraries": [ ++ "-linotify" + ] + }], + ['OS=="win"', { diff --git a/editors/vscode/files/node_modules/patch-node__modules__at_parcel_watcher_binding.gyp b/editors/vscode/files/node_modules/patch-node__modules__at_parcel_watcher_binding.gyp new file mode 100644 index 000000000000..84da531dfd68 --- /dev/null +++ b/editors/vscode/files/node_modules/patch-node__modules__at_parcel_watcher_binding.gyp @@ -0,0 +1,23 @@ +--- node_modules/@parcel/watcher/binding.gyp.orig 2023-05-05 08:53:32 UTC ++++ node_modules/@parcel/watcher/binding.gyp +@@ -34,7 +34,7 @@ + "ARCHS": ["arm64"] + } + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + "sources": [ + "src/watchman/BSER.cc", + "src/watchman/WatchmanBackend.cc", +@@ -46,6 +46,11 @@ + "WATCHMAN", + "INOTIFY", + "BRUTE_FORCE" ++ ] ++ }], ++ ['OS=="freebsd"', { ++ "libraries": [ ++ "-linotify" + ] + }], + ['OS=="win"', { diff --git a/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc new file mode 100644 index 000000000000..c037e9ed555b --- /dev/null +++ b/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc @@ -0,0 +1,11 @@ +--- node_modules/node-pty/src/unix/pty.cc.orig 2023-05-05 07:40:15 UTC ++++ node_modules/node-pty/src/unix/pty.cc +@@ -36,6 +36,8 @@ + #include <pty.h> + #elif defined(__APPLE__) + #include <util.h> ++#elif defined(__FreeBSD__) ++#include <libutil.h> + #endif + + /* Some platforms name VWERASE and VDISCARD differently */ diff --git a/editors/vscode/files/node_modules/patch-remote_node__modules__at_parcel_watcher_binding.gyp b/editors/vscode/files/node_modules/patch-remote_node__modules__at_parcel_watcher_binding.gyp new file mode 100644 index 000000000000..d3079d24a61f --- /dev/null +++ b/editors/vscode/files/node_modules/patch-remote_node__modules__at_parcel_watcher_binding.gyp @@ -0,0 +1,23 @@ +--- remote/node_modules/@parcel/watcher/binding.gyp.orig 2023-05-05 08:51:33 UTC ++++ remote/node_modules/@parcel/watcher/binding.gyp +@@ -34,7 +34,7 @@ + "ARCHS": ["arm64"] + } + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + "sources": [ + "src/watchman/BSER.cc", + "src/watchman/WatchmanBackend.cc", +@@ -46,6 +46,11 @@ + "WATCHMAN", + "INOTIFY", + "BRUTE_FORCE" ++ ] ++ }], ++ ['OS=="freebsd"', { ++ "libraries": [ ++ "-linotify" + ] + }], + ['OS=="win"', { diff --git a/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc new file mode 100644 index 000000000000..443e5ac03a3d --- /dev/null +++ b/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc @@ -0,0 +1,11 @@ +--- remote/node_modules/node-pty/src/unix/pty.cc.orig 2023-05-05 07:41:23 UTC ++++ remote/node_modules/node-pty/src/unix/pty.cc +@@ -36,6 +36,8 @@ + #include <pty.h> + #elif defined(__APPLE__) + #include <util.h> ++#elif defined(__FreeBSD__) ++#include <libutil.h> + #endif + + /* Some platforms name VWERASE and VDISCARD differently */ diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js deleted file mode 100644 index 580369e40129..000000000000 --- a/editors/vscode/files/patch-build_gulpfile.vscode.js +++ /dev/null @@ -1,11 +0,0 @@ ---- build/gulpfile.vscode.js.orig 2023-02-28 11:07:20 UTC -+++ build/gulpfile.vscode.js -@@ -336,7 +336,7 @@ function packageTask(platform, arch, sourceFolderName, - .pipe(util.skipDirectories()) - .pipe(util.fixWin32DirectoryPermissions()) - .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 -- .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })) -+ .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false })) - .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true })); - - if (platform === 'linux') { diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts index ee1d9bdf3597..c5e8462ad8fb 100644 --- a/editors/vscode/files/patch-build_lib_layersChecker.ts +++ b/editors/vscode/files/patch-build_lib_layersChecker.ts @@ -1,6 +1,6 @@ ---- build/lib/layersChecker.ts.orig 2023-03-29 09:14:46 UTC +--- build/lib/layersChecker.ts.orig 2023-05-03 19:37:04 UTC +++ build/lib/layersChecker.ts -@@ -317,7 +317,7 @@ function checkFile(program: ts.Program, sourceFile: ts +@@ -305,7 +305,7 @@ function checkFile(program: ts.Program, sourceFile: ts function createProgram(tsconfigPath: string): ts.Program { const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile); diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js index 81e9a96dc775..fc909031ffd7 100644 --- a/editors/vscode/files/patch-build_npm_postinstall.js +++ b/editors/vscode/files/patch-build_npm_postinstall.js @@ -1,11 +1,13 @@ ---- build/npm/postinstall.js.orig 2023-04-04 22:49:54 UTC +--- build/npm/postinstall.js.orig 2023-05-03 19:37:04 UTC +++ build/npm/postinstall.js -@@ -20,7 +20,13 @@ function yarnInstall(location, opts) { +@@ -41,8 +41,14 @@ function yarnInstall(dir, opts) { const raw = process.env['npm_config_argv'] || '{}'; const argv = JSON.parse(raw); const original = argv.original || []; - const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files'); -+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose']; +- ++ const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', ++ '--ignore-scripts', '--offline', '--no-progress', '--verbose']; + const args = original.filter(arg => passargs.includes(arg)); + if (opts.cwd === 'remote') { + args.push('--use-yarnrc=' + process.env.PWD + '/' + opts.cwd + '/.yarnrc'); @@ -15,7 +17,7 @@ if (opts.ignoreEngines) { args.push('--ignore-engines'); delete opts.ignoreEngines; -@@ -73,5 +79,5 @@ for (let dir of dirs) { +@@ -108,5 +114,5 @@ for (let dir of dirs) { yarnInstall(dir, opts); } diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json index e2637d0cf164..bcaed7efd1c4 100644 --- a/editors/vscode/files/patch-product.json +++ b/editors/vscode/files/patch-product.json @@ -1,6 +1,6 @@ ---- product.json.orig 2023-04-04 22:49:54 UTC +--- product.json.orig 2023-05-03 19:37:04 UTC +++ product.json -@@ -29,6 +29,16 @@ +@@ -32,6 +32,16 @@ "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/", diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js index 93509b19b8de..2d27f73d8fa4 100644 --- a/editors/vscode/files/patch-src_main.js +++ b/editors/vscode/files/patch-src_main.js @@ -1,6 +1,6 @@ ---- src/main.js.orig 2023-03-29 09:14:46 UTC +--- src/main.js.orig 2023-05-03 19:37:04 UTC +++ src/main.js -@@ -189,7 +189,7 @@ function configureCommandlineSwitchesSync(cliArgs) { +@@ -181,7 +181,7 @@ function configureCommandlineSwitchesSync(cliArgs) { 'force-color-profile' ]; 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 b6d78791330d..3d9c6f18dd7e 100644 --- a/editors/vscode/files/patch-src_vs_base_node_ps.ts +++ b/editors/vscode/files/patch-src_vs_base_node_ps.ts @@ -1,6 +1,6 @@ ---- src/vs/base/node/ps.ts.orig 2023-03-29 09:14:46 UTC +--- src/vs/base/node/ps.ts.orig 2023-05-03 19:37:04 UTC +++ src/vs/base/node/ps.ts -@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis +@@ -217,7 +217,7 @@ export function listProcesses(rootPid: number): Promis exec('which ps', {}, (err, stdout, stderr) => { if (err || stderr) { @@ -9,7 +9,7 @@ reject(err || new Error(stderr.toString())); } else { const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh').fsPath); -@@ -229,7 +229,8 @@ export function listProcesses(rootPid: number): Promis +@@ -232,7 +232,8 @@ export function listProcesses(rootPid: number): Promis } } else { const ps = stdout.toString().trim(); 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 5c823454ed26..2e25d358ad15 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,6 +1,6 @@ ---- src/vs/code/electron-main/app.ts.orig 2023-03-29 09:14:46 UTC +--- src/vs/code/electron-main/app.ts.orig 2023-05-03 19:37:04 UTC +++ src/vs/code/electron-main/app.ts -@@ -854,7 +854,7 @@ export class CodeApplication extends Disposable { +@@ -855,7 +855,7 @@ export class CodeApplication extends Disposable { services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); break; diff --git a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts index eaee79547973..027b46b0dc74 100644 --- a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts +++ b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2023-02-28 11:07:20 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2023-05-03 19:37:04 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1732,7 +1732,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1733,7 +1733,8 @@ export class ExtensionEditor extends EditorPane { switch (platform) { case 'win32': key = rawKeyBinding.win; break; |