git: b4ea34b0880a - main - editors/vscode: update to 1.69.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 10 Jul 2022 01:37:33 UTC
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4ea34b0880a0f3572fec55bc4c5d3d0c0d331b1 commit b4ea34b0880a0f3572fec55bc4c5d3d0c0d331b1 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2022-07-10 01:35:42 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2022-07-10 01:37:27 +0000 editors/vscode: update to 1.69.0 Changelog: https://code.visualstudio.com/updates/v1_69 --- editors/vscode/Makefile | 10 +++++----- editors/vscode/distinfo | 18 +++++++++--------- .../vscode/files/patch-build_gulpfile.extensions.js | 4 ++-- editors/vscode/files/patch-build_lib_preLaunch.ts | 6 +++--- editors/vscode/files/patch-build_lib_snapshotLoader.ts | 4 ++-- editors/vscode/files/patch-build_npm_postinstall.js | 4 ++-- .../vscode/files/patch-src_vs_base_common_platform.ts | 8 ++++---- .../files/patch-src_vs_code_electron-main_app.ts | 4 ++-- ...atch-src_vs_workbench_api_browser_mainThreadTask.ts | 4 ++-- ...bench_contrib_extensions_browser_extensionEditor.ts | 4 ++-- .../vscode/files/patch-test_automation_src_electron.ts | 15 +++------------ editors/vscode/pkg-plist | 13 +++++++++++-- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index a154f05f87d3..ee5f99727945 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.68.1 -PORTREVISION= 2 +DISTVERSION= 1.69.0 CATEGORIES= editors MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ https://nodejs.org/dist/v${NODE_VER}/:node_headers \ @@ -45,6 +44,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ liblcms2.so:graphics/lcms2 \ libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ + libwayland-client.so:graphics/wayland \ libwebp.so:graphics/webp \ libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ @@ -69,7 +69,7 @@ USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 30d9c6cd9483b2cc586687151bcbcd635f373630 +SOURCE_COMMIT_HASH= 92d25e35d9bf1a6b16f7d0758f25d48ace11e5b9 BINARY_ALIAS= python=${PYTHON_CMD} @@ -81,7 +81,7 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} # See ${WRKSRC}/remote/.yarnrc for NODE_VER -NODE_VER= 16.13.0 +NODE_VER= 16.13.2 NODE_VER_MAJOR= ${NODE_VER:C/\..*$//} # See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD ESBUILD_VER_BUILD= 0.14.2 @@ -104,7 +104,7 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \ # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 -ELECTRON_DIR= ${.CURDIR}/../../devel/electron17 +ELECTRON_DIR= ${.CURDIR}/../../devel/electron18 .include "${ELECTRON_DIR}/Makefile.version" ELECTRON_DOWNLOAD_URL= https://github.com/electron/electron/releases/download/v${ELECTRON_VER} diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 9d68d2b55404..18236bcbd953 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1655355927 +TIMESTAMP = 1657354185 SHA256 (vscode/esbuild-freebsd-64-0.14.2.tgz) = 9e5669e0afa0bdccdce9ab5c07eeec45cc3116ebdeb2739ff7f11e27c6ab6c34 SIZE (vscode/esbuild-freebsd-64-0.14.2.tgz) = 3228893 SHA256 (vscode/esbuild-freebsd-64-0.11.23.tgz) = 976dc94c9aa92d7ef029c1f5e246883986fa92626aba8c8a37876a6929c64c30 SIZE (vscode/esbuild-freebsd-64-0.11.23.tgz) = 3108323 -SHA256 (vscode/node-v16.13.0-headers.tar.gz) = 9abfc6dcd32bce3b9a978b8c23b8bb48a562c94919feba489f9bb9d4bbeeae66 -SIZE (vscode/node-v16.13.0-headers.tar.gz) = 561593 -SHA256 (vscode/yarn-offline-cache-1.68.1.tar.gz) = 3db0ff9f930b30ed1411a7862d2210158f1d1f8478027a7d1a820066e962b283 -SIZE (vscode/yarn-offline-cache-1.68.1.tar.gz) = 157537500 -SHA256 (vscode/vscode-marketplace-exts-1.68.1.tar.gz) = 115f8a83801d8d8b016505f96c7910dcc4c187dc26c4eac0f80792463a5a54f0 -SIZE (vscode/vscode-marketplace-exts-1.68.1.tar.gz) = 1732522 -SHA256 (vscode/microsoft-vscode-1.68.1_GH0.tar.gz) = 8dc58af3838c02bb1a01a48f3b83425bd9813ade1436beb62bdc03dc7915b16f -SIZE (vscode/microsoft-vscode-1.68.1_GH0.tar.gz) = 15280027 +SHA256 (vscode/node-v16.13.2-headers.tar.gz) = a3e023ea3bc30b629c0e86f069c1900ec8f4ccb5ede1984b96ed831d4b4c469e +SIZE (vscode/node-v16.13.2-headers.tar.gz) = 562606 +SHA256 (vscode/yarn-offline-cache-1.69.0.tar.gz) = 99e28536ebe4abda0b6365613c7121971f2e788a76555d317f3d6bb8040efe9c +SIZE (vscode/yarn-offline-cache-1.69.0.tar.gz) = 165832433 +SHA256 (vscode/vscode-marketplace-exts-1.69.0.tar.gz) = f6d6239b9e2ecbade211e93b9442bb5bb2f6e6bb52445ef1457ee15c8e841afc +SIZE (vscode/vscode-marketplace-exts-1.69.0.tar.gz) = 1732548 +SHA256 (vscode/microsoft-vscode-1.69.0_GH0.tar.gz) = 982af5d93198b5437c3c211276c7b5fd7e3ecf19359c9605df2d6feddee93151 +SIZE (vscode/microsoft-vscode-1.69.0_GH0.tar.gz) = 15405592 diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js index 5e69e0f97b50..b746db09acc3 100644 --- a/editors/vscode/files/patch-build_gulpfile.extensions.js +++ b/editors/vscode/files/patch-build_gulpfile.extensions.js @@ -1,6 +1,6 @@ ---- build/gulpfile.extensions.js.orig 2022-06-08 11:20:55 UTC +--- build/gulpfile.extensions.js.orig 2022-07-05 18:15:23 UTC +++ build/gulpfile.extensions.js -@@ -223,7 +223,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex +@@ -236,7 +236,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series( cleanExtensionsBuildTask, task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))), diff --git a/editors/vscode/files/patch-build_lib_preLaunch.ts b/editors/vscode/files/patch-build_lib_preLaunch.ts index 185a7f5fe40b..2c49428f7fdc 100644 --- a/editors/vscode/files/patch-build_lib_preLaunch.ts +++ b/editors/vscode/files/patch-build_lib_preLaunch.ts @@ -1,6 +1,6 @@ ---- build/lib/preLaunch.ts.orig 2022-02-09 21:24:27 UTC +--- build/lib/preLaunch.ts.orig 2022-07-05 18:15:23 UTC +++ build/lib/preLaunch.ts -@@ -37,9 +37,9 @@ async function ensureNodeModules() { +@@ -35,9 +35,9 @@ async function ensureNodeModules() { } } @@ -13,7 +13,7 @@ async function ensureCompiled() { if (!(await exists('out'))) { -@@ -49,7 +49,7 @@ async function ensureCompiled() { +@@ -47,7 +47,7 @@ async function ensureCompiled() { async function main() { await ensureNodeModules(); diff --git a/editors/vscode/files/patch-build_lib_snapshotLoader.ts b/editors/vscode/files/patch-build_lib_snapshotLoader.ts index 44fd3f663a08..2495de98ca7c 100644 --- a/editors/vscode/files/patch-build_lib_snapshotLoader.ts +++ b/editors/vscode/files/patch-build_lib_snapshotLoader.ts @@ -1,6 +1,6 @@ ---- build/lib/snapshotLoader.ts.orig 2019-12-18 06:46:04 UTC +--- build/lib/snapshotLoader.ts.orig 2022-07-05 18:15:23 UTC +++ build/lib/snapshotLoader.ts -@@ -27,7 +27,7 @@ namespace snaps { +@@ -25,7 +25,7 @@ namespace snaps { break; case 'win32': diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js index 44581f460354..523afaa94179 100644 --- a/editors/vscode/files/patch-build_npm_postinstall.js +++ b/editors/vscode/files/patch-build_npm_postinstall.js @@ -1,4 +1,4 @@ ---- build/npm/postinstall.js.orig 2022-06-08 11:20:55 UTC +--- build/npm/postinstall.js.orig 2022-07-05 18:15:23 UTC +++ build/npm/postinstall.js @@ -20,7 +20,9 @@ function yarnInstall(location, opts) { const raw = process.env['npm_config_argv'] || '{}'; @@ -11,7 +11,7 @@ if (opts.ignoreEngines) { args.push('--ignore-engines'); delete opts.ignoreEngines; -@@ -73,5 +74,5 @@ for (let dir of dirs) { +@@ -73,5 +75,5 @@ for (let dir of dirs) { yarnInstall(dir, opts); } 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 455f161e984a..cc81f847e0dd 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 2022-05-16 17:42:35 UTC +--- src/vs/base/common/platform.ts.orig 2022-07-05 18:15:23 UTC +++ src/vs/base/common/platform.ts @@ -78,7 +78,7 @@ if (typeof navigator === 'object' && !isElectronRender _isWindows = _userAgent.indexOf('Windows') >= 0; @@ -7,9 +7,9 @@ - _isLinux = _userAgent.indexOf('Linux') >= 0; + _isLinux = (_userAgent.indexOf('Linux') >= 0 || _userAgent.indexOf('FreeBSD') >= 0); _isWeb = true; - _locale = navigator.language; - _language = _locale; -@@ -88,7 +88,7 @@ if (typeof navigator === 'object' && !isElectronRender + + const configuredLocale = nls.getConfiguredDefaultLocale( +@@ -98,7 +98,7 @@ if (typeof navigator === 'object' && !isElectronRender else if (typeof nodeProcess === 'object') { _isWindows = (nodeProcess.platform === 'win32'); _isMacintosh = (nodeProcess.platform === 'darwin'); 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 e8bc5965213b..6b8519b49a40 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 2022-06-08 11:20:55 UTC +--- src/vs/code/electron-main/app.ts.orig 2022-07-05 18:15:23 UTC +++ src/vs/code/electron-main/app.ts -@@ -587,7 +587,7 @@ export class CodeApplication extends Disposable { +@@ -588,7 +588,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 e0524753a7aa..170b9467281c 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,6 +1,6 @@ ---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2022-06-08 11:20:55 UTC +--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2022-07-05 18:15:23 UTC +++ src/vs/workbench/api/browser/mainThreadTask.ts -@@ -662,7 +662,7 @@ export class MainThreadTask implements MainThreadTaskS +@@ -663,7 +663,7 @@ export class MainThreadTask implements MainThreadTaskS case 'darwin': platform = Platform.Platform.Mac; 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 07388aa6ce82..a13245dfc360 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 2022-06-08 11:20:55 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2022-07-05 18:15:23 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1773,7 +1773,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1689,7 +1689,8 @@ export class ExtensionEditor extends EditorPane { switch (platform) { case 'win32': key = rawKeyBinding.win; break; diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index 0c9896d3bb5d..b6be5f06e006 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,15 +1,6 @@ ---- test/automation/src/electron.ts.orig 2022-05-19 00:38:13 UTC +--- test/automation/src/electron.ts.orig 2022-07-05 18:15:23 UTC +++ test/automation/src/electron.ts -@@ -41,7 +41,7 @@ export async function resolveElectronConfiguration(opt - args.push('--verbose'); - } - -- if (process.platform === 'linux') { -+ if (process.platform === 'linux' || process.platform === 'freebsd') { - args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled - } - -@@ -97,7 +97,7 @@ export function getDevElectronPath(): string { +@@ -101,7 +101,7 @@ export function getDevElectronPath(): string { switch (process.platform) { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); @@ -18,7 +9,7 @@ return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -110,7 +110,7 @@ export function getBuildElectronPath(root: string): st +@@ -114,7 +114,7 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist index 3bcf4e66e4ac..d66e5086d015 100644 --- a/editors/vscode/pkg-plist +++ b/editors/vscode/pkg-plist @@ -13,7 +13,7 @@ share/applications/code-oss.desktop %%DATADIR%%/libGLESv2.so %%DATADIR%%/libffmpeg.so %%DATADIR%%/libvk_swiftshader.so -%%DATADIR%%/libvulkan.so.1 +%%DATADIR%%/libvulkan.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/bg.pak @@ -181,6 +181,9 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/git/dist/askpass-empty.sh %%DATADIR%%/resources/app/extensions/git/dist/askpass-main.js %%DATADIR%%/resources/app/extensions/git/dist/askpass.sh +%%DATADIR%%/resources/app/extensions/git/dist/git-editor-empty.sh +%%DATADIR%%/resources/app/extensions/git/dist/git-editor-main.js +%%DATADIR%%/resources/app/extensions/git/dist/git-editor.sh %%DATADIR%%/resources/app/extensions/git/dist/main.js %%DATADIR%%/resources/app/extensions/git/dist/main.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/git/dist/nls.metadata.header.json @@ -207,6 +210,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/git/resources/icons/light/status-untracked.svg %%DATADIR%%/resources/app/extensions/github-authentication/README.md %%DATADIR%%/resources/app/extensions/github-authentication/dist/extension.js +%%DATADIR%%/resources/app/extensions/github-authentication/dist/extension.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.header.json %%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.json %%DATADIR%%/resources/app/extensions/github-authentication/images/icon.png @@ -325,6 +329,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/javascript/tags-language-configuration.json %%DATADIR%%/resources/app/extensions/json-language-features/README.md %%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/jsonClientMain.js +%%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/jsonClientMain.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/nls.metadata.header.json %%DATADIR%%/resources/app/extensions/json-language-features/client/dist/node/nls.metadata.json %%DATADIR%%/resources/app/extensions/json-language-features/icons/json.png @@ -375,6 +380,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json %%DATADIR%%/resources/app/extensions/markdown-language-features/README.md %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js +%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.header.json %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.json %%DATADIR%%/resources/app/extensions/markdown-language-features/esbuild-notebook.js @@ -428,6 +434,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/merge-conflict/package.nls.json %%DATADIR%%/resources/app/extensions/microsoft-authentication/README.md %%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/extension.js +%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/extension.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.header.json %%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.json %%DATADIR%%/resources/app/extensions/microsoft-authentication/media/auth.css @@ -532,7 +539,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/edgeDevToolOpener.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/linkedBreakpointLocationUI.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/longPredictionUI.nls.metadata.json -%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/prettyPrint.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/processPicker.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/profiling/breakpointTerminationCondition.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/profiling/durationTerminationCondition.nls.metadata.json @@ -835,6 +841,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/typescript-basics/syntaxes/jsdoc.ts.injection.tmLanguage.json %%DATADIR%%/resources/app/extensions/typescript-language-features/README.md %%DATADIR%%/resources/app/extensions/typescript-language-features/dist/extension.js +%%DATADIR%%/resources/app/extensions/typescript-language-features/dist/extension.js.LICENSE.txt %%DATADIR%%/resources/app/extensions/typescript-language-features/dist/nls.metadata.header.json %%DATADIR%%/resources/app/extensions/typescript-language-features/dist/nls.metadata.json %%DATADIR%%/resources/app/extensions/typescript-language-features/media/icon.png @@ -889,6 +896,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/base/common/performance.js %%DATADIR%%/resources/app/out/vs/base/common/stripComments.js %%DATADIR%%/resources/app/out/vs/base/common/worker/simpleWorker.js +%%DATADIR%%/resources/app/out/vs/base/common/worker/simpleWorker.nls.js %%DATADIR%%/resources/app/out/vs/base/node/cpuUsage.sh %%DATADIR%%/resources/app/out/vs/base/node/languagePacks.js %%DATADIR%%/resources/app/out/vs/base/node/ps.sh @@ -918,6 +926,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/code/node/cli.nls.js %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.nls.js +%%DATADIR%%/resources/app/out/vs/editor/common/services/editorSimpleWorker.nls.js %%DATADIR%%/resources/app/out/vs/loader.js %%DATADIR%%/resources/app/out/vs/platform/environment/node/userDataPath.js %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js