summaryrefslogtreecommitdiff
path: root/editors/vscode/files
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2020-03-15 07:20:20 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2020-03-15 07:20:20 +0000
commit3d1bdfca59fde6d8ec63d59100224f438285f346 (patch)
tree28b735f7f18d30786f7a60bca250880407492175 /editors/vscode/files
parentAdd a note that this port can't be updated without an exp-run (diff)
Update to 1.43.0
Submitted by: maintainer (via Github)
Diffstat (limited to 'editors/vscode/files')
-rw-r--r--editors/vscode/files/patch-build_lib_layersChecker.ts4
-rw-r--r--editors/vscode/files/patch-src_bootstrap.js2
-rw-r--r--editors/vscode/files/patch-src_main.js11
-rw-r--r--editors/vscode/files/patch-src_vs_code_electron-main_app.ts4
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts2
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts2
-rw-r--r--editors/vscode/files/patch-test_integration_browser_src_index.ts11
-rw-r--r--editors/vscode/files/patch-test_smoke_src_main.ts38
8 files changed, 48 insertions, 26 deletions
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index c41acf0a54ba..d09136a07f1b 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 2020-02-08 09:06:59 UTC
+--- build/lib/layersChecker.ts.orig 2020-03-09 13:51:53 UTC
+++ build/lib/layersChecker.ts
-@@ -215,7 +215,7 @@ function checkFile(program: ts.Program, sourceFile: ts
+@@ -225,7 +225,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-src_bootstrap.js b/editors/vscode/files/patch-src_bootstrap.js
index aa797b02d63c..b47a49d237c2 100644
--- a/editors/vscode/files/patch-src_bootstrap.js
+++ b/editors/vscode/files/patch-src_bootstrap.js
@@ -1,4 +1,4 @@
---- src/bootstrap.js.orig 2019-12-10 21:16:00 UTC
+--- src/bootstrap.js.orig 2020-03-09 16:22:02 UTC
+++ src/bootstrap.js
@@ -243,7 +243,7 @@ exports.configurePortable = function () {
return process.env['VSCODE_PORTABLE'];
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js
new file mode 100644
index 000000000000..901219c0cae5
--- /dev/null
+++ b/editors/vscode/files/patch-src_main.js
@@ -0,0 +1,11 @@
+--- src/main.js.orig 2020-03-10 09:24:33 UTC
++++ src/main.js
+@@ -137,7 +137,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+ 'force-color-profile'
+ ];
+
+- if (process.platform === 'linux') {
++ if (process.platform === 'linux' || process.platform === 'freebsd') {
+ SUPPORTED_ELECTRON_SWITCHES.push('force-renderer-accessibility');
+ }
+
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 2998ef9684be..577a214b6813 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 2019-12-10 21:16:00 UTC
+--- src/vs/code/electron-main/app.ts.orig 2020-03-09 13:51:53 UTC
+++ src/vs/code/electron-main/app.ts
-@@ -437,7 +437,7 @@ export class CodeApplication extends Disposable {
+@@ -436,7 +436,7 @@ export class CodeApplication extends Disposable {
services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
break;
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 6dd9a093596d..34e9f7bc325d 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,4 +1,4 @@
---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2020-02-05 19:39:53 UTC
+--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2020-03-09 16:22:02 UTC
+++ src/vs/workbench/api/browser/mainThreadTask.ts
@@ -592,7 +592,7 @@ export class MainThreadTask implements MainThreadTaskS
case 'darwin':
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 57046d816a30..98d63ca9c3d6 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,4 +1,4 @@
---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2019-12-10 21:16:00 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2020-03-09 16:22:02 UTC
+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -1361,7 +1361,8 @@ export class ExtensionEditor extends BaseEditor {
diff --git a/editors/vscode/files/patch-test_integration_browser_src_index.ts b/editors/vscode/files/patch-test_integration_browser_src_index.ts
new file mode 100644
index 000000000000..eabc3235da05
--- /dev/null
+++ b/editors/vscode/files/patch-test_integration_browser_src_index.ts
@@ -0,0 +1,11 @@
+--- test/integration/browser/src/index.ts.orig 2020-03-10 09:27:36 UTC
++++ test/integration/browser/src/index.ts
+@@ -30,7 +30,7 @@ const width = 1200;
+ const height = 800;
+
+ async function runTestsInBrowser(browserType: 'chromium' | 'firefox' | 'webkit', endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
+- const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
++ const args = (process.platform === 'linux' || process.platform === 'freebsd') && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
+ const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), dumpio: true, args });
+ const context = await browser.newContext();
+ const page = await context.newPage();
diff --git a/editors/vscode/files/patch-test_smoke_src_main.ts b/editors/vscode/files/patch-test_smoke_src_main.ts
index a47b228dcf58..8aeca9a4f090 100644
--- a/editors/vscode/files/patch-test_smoke_src_main.ts
+++ b/editors/vscode/files/patch-test_smoke_src_main.ts
@@ -1,20 +1,20 @@
---- test/smoke/src/main.ts.orig 2020-02-05 19:39:53 UTC
+--- test/smoke/src/main.ts.orig 2020-03-09 16:22:02 UTC
+++ test/smoke/src/main.ts
-@@ -95,7 +95,7 @@ function getDevElectronPath(): string {
- switch (process.platform) {
- case 'darwin':
- return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
-- case 'linux':
-+ case 'linux': case 'freebsd':
- return path.join(buildPath, 'electron', `${product.applicationName}`);
- case 'win32':
- return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
-@@ -108,7 +108,7 @@ function getBuildElectronPath(root: string): string {
- switch (process.platform) {
- case 'darwin':
- return path.join(root, 'Contents', 'MacOS', 'Electron');
-- case 'linux': {
-+ case 'linux': case 'freebsd': {
- const product = require(path.join(root, 'resources', 'app', 'product.json'));
- return path.join(root, product.applicationName);
- }
+@@ -94,7 +94,7 @@ if (!opts.web) {
+ switch (process.platform) {
+ case 'darwin':
+ return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
+- case 'linux':
++ case 'linux': case 'freebsd':
+ return path.join(buildPath, 'electron', `${product.applicationName}`);
+ case 'win32':
+ return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
+@@ -107,7 +107,7 @@ if (!opts.web) {
+ switch (process.platform) {
+ case 'darwin':
+ return path.join(root, 'Contents', 'MacOS', 'Electron');
+- case 'linux': {
++ case 'linux': case 'freebsd': {
+ const product = require(path.join(root, 'resources', 'app', 'product.json'));
+ return path.join(root, product.applicationName);
+ }