From owner-svn-ports-head@freebsd.org Mon Feb 8 11:19:38 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9984B52E46E; Mon, 8 Feb 2021 11:19:38 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZ3T63tqnz3KMm; Mon, 8 Feb 2021 11:19:38 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78B4316A49; Mon, 8 Feb 2021 11:19:38 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 118BJc5l078897; Mon, 8 Feb 2021 11:19:38 GMT (envelope-from tagattie@FreeBSD.org) Received: (from tagattie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 118BJZLU078884; Mon, 8 Feb 2021 11:19:35 GMT (envelope-from tagattie@FreeBSD.org) Message-Id: <202102081119.118BJZLU078884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tagattie set sender to tagattie@FreeBSD.org using -f From: Hiroki Tagato Date: Mon, 8 Feb 2021 11:19:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564696 - in head/editors/vscode: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tagattie X-SVN-Commit-Paths: in head/editors/vscode: . files X-SVN-Commit-Revision: 564696 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2021 11:19:38 -0000 Author: tagattie Date: Mon Feb 8 11:19:35 2021 New Revision: 564696 URL: https://svnweb.freebsd.org/changeset/ports/564696 Log: Update to 1.53.0 Changelog: https://code.visualstudio.com/updates/v1_53 Modified: head/editors/vscode/Makefile head/editors/vscode/distinfo head/editors/vscode/files/patch-build_gulpfile.extensions.js head/editors/vscode/files/patch-build_gulpfile.vscode.js head/editors/vscode/files/patch-build_lib_layersChecker.ts head/editors/vscode/files/patch-build_npm_postinstall.js head/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts head/editors/vscode/files/patch-src_main.js head/editors/vscode/files/patch-src_vs_base_common_platform.ts head/editors/vscode/files/patch-src_vs_code_electron-main_app.ts head/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts head/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts head/editors/vscode/files/patch-test_smoke_src_main.ts head/editors/vscode/pkg-plist Modified: head/editors/vscode/Makefile ============================================================================== --- head/editors/vscode/Makefile Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/Makefile Mon Feb 8 11:19:35 2021 (r564696) @@ -1,12 +1,13 @@ # $FreeBSD$ PORTNAME= vscode -DISTVERSION= 1.52.1 -PORTREVISION= 2 +DISTVERSION= 1.53.0 CATEGORIES= editors -MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \ +MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ + https://nodejs.org/dist/v${NODE_VER}/:node_headers \ https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache -DISTFILES= node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \ +DISTFILES= esbuild-freebsd-64-${ESBUILD_VER}.tgz:esbuild_binary \ + node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \ yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \ vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache DIST_SUBDIR= ${PORTNAME} @@ -50,6 +51,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ + libxkbcommon.so:x11/libxkbcommon \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ xdg-open:devel/xdg-utils \ @@ -63,7 +65,7 @@ USES= desktop-file-utils gl gmake gnome jpeg pkgconfi USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= ea3859d4ba2f3e577a159bc91e3074c5d85c0523 +SOURCE_COMMIT_HASH= 8490d3dde47c57ba65ec40dd192d014fd2113496 BINARY_ALIAS= python=${PYTHON_CMD} @@ -75,8 +77,10 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 li USE_LDCONFIG= ${DATADIR} # See ${WRKSRC}/remote/.yarnrc for NODE_VER -NODE_VER= 12.14.1 +NODE_VER= 12.18.3 NODE_VER_MAJOR= ${NODE_VER:C/\..*$//} +# See ${WRKSRC}/build/package.json for ESBUILD_VER +ESBUILD_VER= 0.8.30 SHEBANG_REGEX= ./(extensions|resources|scripts|src)/.*\.sh$$ PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts @@ -95,7 +99,7 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-brows # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 -ELECTRON_DIR= ${.CURDIR}/../../devel/electron9 +ELECTRON_DIR= ${.CURDIR}/../../devel/electron11 .include "${ELECTRON_DIR}/Makefile.version" pre-everything:: @@ -107,6 +111,12 @@ pre-everything:: @${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096" @${ECHO_MSG} "" +post-extract: + # setup download cache for esbuild binary + ${MKDIR} ${WRKDIR}/.cache/esbuild/bin + ${MV} ${WRKDIR}/package/bin/esbuild \ + ${WRKDIR}/.cache/esbuild/bin/esbuild-freebsd-64@${ESBUILD_VER} + post-patch: # force use of electron version matching port one ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \ @@ -205,6 +215,7 @@ do-install: .for f in chromedriver mksnapshot v8_context_snapshot_generator ${RM} ${STAGEDIR}${DATADIR}/${f} .endfor + ${RM} -r ${STAGEDIR}${DATADIR}/gen ${RM} -r ${STAGEDIR}${DATADIR}/node_headers ${RM} -r ${STAGEDIR}${DATADIR}/resources/completions ${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin Modified: head/editors/vscode/distinfo ============================================================================== --- head/editors/vscode/distinfo Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/distinfo Mon Feb 8 11:19:35 2021 (r564696) @@ -1,9 +1,11 @@ -TIMESTAMP = 1611038721 -SHA256 (vscode/node-v12.14.1-headers.tar.gz) = 944b436e1e8fe19b0c7397ebd3680abefe81d5958d9341bef99fbe0c9fffa93c -SIZE (vscode/node-v12.14.1-headers.tar.gz) = 552615 -SHA256 (vscode/yarn-offline-cache-1.52.1.tar.gz) = 12aed37632da333bc5a65e6aa6b3355bb4d558d6b68f1f080502d7f5b49f7618 -SIZE (vscode/yarn-offline-cache-1.52.1.tar.gz) = 181268444 -SHA256 (vscode/vscode-marketplace-exts-1.52.1.tar.gz) = ae6ddc2a3bd7676f18121b2827ec852c89171c1c0d7a30432cf0350488de9521 -SIZE (vscode/vscode-marketplace-exts-1.52.1.tar.gz) = 2292156 -SHA256 (vscode/microsoft-vscode-1.52.1_GH0.tar.gz) = 4a2b4e3500bff73503322fc3a68099ec4151d3e800cf2bb6e9478f2e94637b6a -SIZE (vscode/microsoft-vscode-1.52.1_GH0.tar.gz) = 11792551 +TIMESTAMP = 1612772218 +SHA256 (vscode/esbuild-freebsd-64-0.8.30.tgz) = 6411afe1826beb7b1fc47c7f55fb5799d86a5b9a0abd8b60b02c9a9f4e21d6d8 +SIZE (vscode/esbuild-freebsd-64-0.8.30.tgz) = 2924493 +SHA256 (vscode/node-v12.18.3-headers.tar.gz) = 164edc71e46cf86ac5d9fcac00dc69c09bb09614b767c4c775aa7747b42e8188 +SIZE (vscode/node-v12.18.3-headers.tar.gz) = 555440 +SHA256 (vscode/yarn-offline-cache-1.53.0.tar.gz) = 8940a604702589964234639d18dcdeea870133b1ef41b458fa00f44f1b08e062 +SIZE (vscode/yarn-offline-cache-1.53.0.tar.gz) = 123227496 +SHA256 (vscode/vscode-marketplace-exts-1.53.0.tar.gz) = 51836d8f747c8092df385078a3c1ed6cd1f523b9d5cf6f5601e718f1e3d92f9c +SIZE (vscode/vscode-marketplace-exts-1.53.0.tar.gz) = 2290612 +SHA256 (vscode/microsoft-vscode-1.53.0_GH0.tar.gz) = f6ff147a261763e8b9323a82646ededad5d4069b7809e34ec260364afcdbe997 +SIZE (vscode/microsoft-vscode-1.53.0_GH0.tar.gz) = 12157065 Modified: head/editors/vscode/files/patch-build_gulpfile.extensions.js ============================================================================== --- head/editors/vscode/files/patch-build_gulpfile.extensions.js Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-build_gulpfile.extensions.js Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- build/gulpfile.extensions.js.orig 2020-08-25 09:40:01 UTC +--- build/gulpfile.extensions.js.orig 2021-02-03 15:33:23 UTC +++ build/gulpfile.extensions.js -@@ -166,7 +166,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex +@@ -205,7 +205,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'))), @@ -9,7 +9,7 @@ )); gulp.task(compileExtensionsBuildTask); -@@ -244,5 +244,3 @@ async function buildWebExtensions(isWatch) { +@@ -286,5 +286,3 @@ async function buildWebExtensions(isWatch) { } }); } Modified: head/editors/vscode/files/patch-build_gulpfile.vscode.js ============================================================================== --- head/editors/vscode/files/patch-build_gulpfile.vscode.js Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-build_gulpfile.vscode.js Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- build/gulpfile.vscode.js.orig 2020-12-16 14:57:12 UTC +--- build/gulpfile.vscode.js.orig 2021-02-03 15:33:23 UTC +++ build/gulpfile.vscode.js -@@ -267,7 +267,7 @@ function packageTask(platform, arch, sourceFolderName, +@@ -284,7 +284,7 @@ function packageTask(platform, arch, sourceFolderName, let result = all .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()) Modified: head/editors/vscode/files/patch-build_lib_layersChecker.ts ============================================================================== --- head/editors/vscode/files/patch-build_lib_layersChecker.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-build_lib_layersChecker.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- build/lib/layersChecker.ts.orig 2020-10-13 14:05:48 UTC +--- build/lib/layersChecker.ts.orig 2021-02-03 15:33:23 UTC +++ build/lib/layersChecker.ts -@@ -301,7 +301,7 @@ function checkFile(program: ts.Program, sourceFile: ts +@@ -299,7 +299,7 @@ function checkFile(program: ts.Program, sourceFile: ts function createProgram(tsconfigPath: string): ts.Program { const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile); Modified: head/editors/vscode/files/patch-build_npm_postinstall.js ============================================================================== --- head/editors/vscode/files/patch-build_npm_postinstall.js Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-build_npm_postinstall.js Mon Feb 8 11:19:35 2021 (r564696) @@ -1,18 +1,20 @@ ---- build/npm/postinstall.js.orig 2020-07-21 14:27:11 UTC +--- build/npm/postinstall.js.orig 2021-02-03 15:33:23 UTC +++ build/npm/postinstall.js -@@ -20,7 +20,8 @@ function yarnInstall(location, opts) { +@@ -21,8 +21,9 @@ function yarnInstall(location, 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'); +- if (opts.ignoreEngines) { + const passargs = ['--ignore-optional', '--frozen-lockfile', '--offline', '--no-progress', '--verbose']; + const args = original.filter(arg => passargs.includes(arg)); - - console.log(`Installing dependencies in ${location}...`); - console.log(`$ yarn ${args.join(' ')}`); -@@ -74,4 +75,4 @@ yarnInstall('test/smoke'); // node modules required fo - yarnInstall('test/integration/browser'); // node modules required for integration - yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron ++ if (opts.ignoreEngines) { + args.push('--ignore-engines'); + delete opts.ignoreEngines; + } +@@ -88,4 +89,4 @@ runtime "${runtime}"`; + yarnInstall(watchPath); + } -cp.execSync('git config pull.rebase true'); +// cp.execSync('git config pull.rebase true'); Modified: head/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts ============================================================================== --- head/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,4 +1,4 @@ ---- extensions/vscode-test-resolver/src/util/processes.ts.orig 2019-12-18 06:37:56 UTC +--- extensions/vscode-test-resolver/src/util/processes.ts.orig 2021-02-03 15:33:23 UTC +++ extensions/vscode-test-resolver/src/util/processes.ts @@ -20,7 +20,7 @@ export function terminateProcess(p: cp.ChildProcess, e } catch (err) { @@ -8,4 +8,4 @@ + } else if (process.platform === 'darwin' || process.platform === 'linux' || process.platform === 'freebsd') { try { const cmd = path.join(extensionPath, 'scripts', 'terminateProcess.sh'); - const result = cp.spawnSync(cmd, [process.pid.toString()]); + const result = cp.spawnSync(cmd, [p.pid.toString()]); Modified: head/editors/vscode/files/patch-src_main.js ============================================================================== --- head/editors/vscode/files/patch-src_main.js Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-src_main.js Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- src/main.js.orig 2020-12-16 14:57:12 UTC +--- src/main.js.orig 2021-02-03 15:33:23 UTC +++ src/main.js -@@ -230,7 +230,7 @@ function configureCommandlineSwitchesSync(cliArgs) { +@@ -227,7 +227,7 @@ function configureCommandlineSwitchesSync(cliArgs) { 'force-color-profile' ]; Modified: head/editors/vscode/files/patch-src_vs_base_common_platform.ts ============================================================================== --- head/editors/vscode/files/patch-src_vs_base_common_platform.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-src_vs_base_common_platform.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- src/vs/base/common/platform.ts.orig 2020-12-16 14:57:12 UTC +--- src/vs/base/common/platform.ts.orig 2021-02-03 15:33:23 UTC +++ src/vs/base/common/platform.ts -@@ -27,7 +27,7 @@ export interface IProcessEnvironment { +@@ -28,7 +28,7 @@ export interface IProcessEnvironment { } export interface INodeProcess { @@ -9,7 +9,7 @@ env: IProcessEnvironment; nextTick: Function; versions?: { -@@ -68,7 +68,7 @@ if (typeof navigator === 'object' && !isElectronRender +@@ -89,7 +89,7 @@ if (typeof navigator === 'object' && !isElectronRender _isWindows = _userAgent.indexOf('Windows') >= 0; _isMacintosh = _userAgent.indexOf('Macintosh') >= 0; _isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0; @@ -18,12 +18,12 @@ _isWeb = true; _locale = navigator.language; _language = _locale; -@@ -78,7 +78,7 @@ if (typeof navigator === 'object' && !isElectronRender +@@ -99,7 +99,7 @@ if (typeof navigator === 'object' && !isElectronRender else if (typeof nodeProcess === 'object') { _isWindows = (nodeProcess.platform === 'win32'); _isMacintosh = (nodeProcess.platform === 'darwin'); - _isLinux = (nodeProcess.platform === 'linux'); + _isLinux = (nodeProcess.platform === 'linux' || nodeProcess.platform === 'freebsd'); + _isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION']; _locale = LANGUAGE_DEFAULT; _language = LANGUAGE_DEFAULT; - const rawNlsConfig = nodeProcess.env['VSCODE_NLS_CONFIG']; Modified: head/editors/vscode/files/patch-src_vs_code_electron-main_app.ts ============================================================================== --- head/editors/vscode/files/patch-src_vs_code_electron-main_app.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-src_vs_code_electron-main_app.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,11 +1,11 @@ ---- src/vs/code/electron-main/app.ts.orig 2020-12-16 14:57:12 UTC +--- src/vs/code/electron-main/app.ts.orig 2021-02-03 15:33:23 UTC +++ src/vs/code/electron-main/app.ts -@@ -495,7 +495,7 @@ export class CodeApplication extends Disposable { +@@ -509,7 +509,7 @@ export class CodeApplication extends Disposable { services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); break; - case 'linux': + case 'linux': case 'freebsd': - if (process.env.SNAP && process.env.SNAP_REVISION) { - services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env.SNAP, process.env.SNAP_REVISION])); + if (isLinuxSnap) { + services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env['SNAP'], process.env['SNAP_REVISION']])); } else { Modified: head/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts ============================================================================== --- head/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2020-11-10 22:57:26 UTC +--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2021-02-03 15:33:23 UTC +++ src/vs/workbench/api/browser/mainThreadTask.ts -@@ -645,7 +645,7 @@ export class MainThreadTask implements MainThreadTaskS +@@ -651,7 +651,7 @@ export class MainThreadTask implements MainThreadTaskS case 'darwin': platform = Platform.Platform.Mac; break; Modified: head/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts ============================================================================== --- head/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2020-12-16 14:57:12 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-02-03 15:33:23 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1445,7 +1445,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1467,7 +1467,8 @@ export class ExtensionEditor extends EditorPane { switch (platform) { case 'win32': key = rawKeyBinding.win; break; Modified: head/editors/vscode/files/patch-test_smoke_src_main.ts ============================================================================== --- head/editors/vscode/files/patch-test_smoke_src_main.ts Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/files/patch-test_smoke_src_main.ts Mon Feb 8 11:19:35 2021 (r564696) @@ -1,6 +1,6 @@ ---- test/smoke/src/main.ts.orig 2020-06-09 17:02:22 UTC +--- test/smoke/src/main.ts.orig 2021-02-03 15:33:23 UTC +++ test/smoke/src/main.ts -@@ -95,7 +95,7 @@ if (!opts.web) { +@@ -90,7 +90,7 @@ if (!opts.web) { switch (process.platform) { case 'darwin': return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); @@ -9,7 +9,7 @@ return path.join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return path.join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -108,7 +108,7 @@ if (!opts.web) { +@@ -103,7 +103,7 @@ if (!opts.web) { switch (process.platform) { case 'darwin': return path.join(root, 'Contents', 'MacOS', 'Electron'); Modified: head/editors/vscode/pkg-plist ============================================================================== --- head/editors/vscode/pkg-plist Mon Feb 8 11:18:03 2021 (r564695) +++ head/editors/vscode/pkg-plist Mon Feb 8 11:19:35 2021 (r564696) @@ -135,6 +135,8 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/docker/syntaxes/docker.tmLanguage.json %%DATADIR%%/resources/app/extensions/emmet/README.md %%DATADIR%%/resources/app/extensions/emmet/dist/node/emmetNodeMain.js +%%DATADIR%%/resources/app/extensions/emmet/dist/node/nls.metadata.header.json +%%DATADIR%%/resources/app/extensions/emmet/dist/node/nls.metadata.json %%DATADIR%%/resources/app/extensions/emmet/images/icon.png %%DATADIR%%/resources/app/extensions/emmet/package.json %%DATADIR%%/resources/app/extensions/emmet/package.nls.json @@ -835,7 +837,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/ms-vscode.references-view/README.md %%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js %%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js.map -%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/media/container-icon.svg %%DATADIR%%/resources/app/extensions/ms-vscode.references-view/media/icon.png %%DATADIR%%/resources/app/extensions/ms-vscode.references-view/package.json %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md @@ -966,7 +967,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/pug/package.json %%DATADIR%%/resources/app/extensions/pug/package.nls.json %%DATADIR%%/resources/app/extensions/pug/syntaxes/pug.tmLanguage.json -%%DATADIR%%/resources/app/extensions/python/dist/pythonMain.js %%DATADIR%%/resources/app/extensions/python/language-configuration.json %%DATADIR%%/resources/app/extensions/python/package.json %%DATADIR%%/resources/app/extensions/python/package.nls.json @@ -1009,6 +1009,16 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/shellscript/package.json %%DATADIR%%/resources/app/extensions/shellscript/package.nls.json %%DATADIR%%/resources/app/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json +%%DATADIR%%/resources/app/extensions/simple-browser/README.md +%%DATADIR%%/resources/app/extensions/simple-browser/dist/extension.js +%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.header.json +%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.json +%%DATADIR%%/resources/app/extensions/simple-browser/media/index.js +%%DATADIR%%/resources/app/extensions/simple-browser/media/main.css +%%DATADIR%%/resources/app/extensions/simple-browser/media/preview-dark.svg +%%DATADIR%%/resources/app/extensions/simple-browser/media/preview-light.svg +%%DATADIR%%/resources/app/extensions/simple-browser/package.json +%%DATADIR%%/resources/app/extensions/simple-browser/package.nls.json %%DATADIR%%/resources/app/extensions/sql/build/update-grammar.js %%DATADIR%%/resources/app/extensions/sql/language-configuration.json %%DATADIR%%/resources/app/extensions/sql/package.json @@ -1020,6 +1030,12 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/swift/package.nls.json %%DATADIR%%/resources/app/extensions/swift/snippets/swift.code-snippets %%DATADIR%%/resources/app/extensions/swift/syntaxes/swift.tmLanguage.json +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/README.md +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/dist/extension.js +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/dist/nls.metadata.header.json +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/dist/nls.metadata.json +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/package.json +%%DATADIR%%/resources/app/extensions/testing-editor-contributions/package.nls.json %%DATADIR%%/resources/app/extensions/theme-abyss/package.json %%DATADIR%%/resources/app/extensions/theme-abyss/package.nls.json %%DATADIR%%/resources/app/extensions/theme-abyss/themes/abyss-color-theme.json @@ -1082,6 +1098,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json %%DATADIR%%/resources/app/extensions/typescript-basics/syntaxes/jsdoc.js.injection.tmLanguage.json %%DATADIR%%/resources/app/extensions/typescript-basics/syntaxes/jsdoc.ts.injection.tmLanguage.json +%%DATADIR%%/resources/app/extensions/typescript-language-features/.eslintrc.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/nls.metadata.header.json @@ -1137,8 +1154,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/main.js %%DATADIR%%/resources/app/out/nls.metadata.json %%DATADIR%%/resources/app/out/paths.js -%%DATADIR%%/resources/app/out/vs/base/browser/ui/codicons/codicon/codicon-animations.css -%%DATADIR%%/resources/app/out/vs/base/browser/ui/codicons/codicon/codicon-modifications.css +%%DATADIR%%/resources/app/out/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css %%DATADIR%%/resources/app/out/vs/base/browser/ui/codicons/codicon/codicon.css %%DATADIR%%/resources/app/out/vs/base/browser/ui/codicons/codicon/codicon.ttf %%DATADIR%%/resources/app/out/vs/base/common/performance.js @@ -1166,8 +1182,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.css %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.js %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.nls.js -%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/proxy/auth.html -%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/proxy/auth.js %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.html %%DATADIR%%/resources/app/out/vs/code/node/cli.js %%DATADIR%%/resources/app/out/vs/code/node/cli.nls.js @@ -1203,7 +1217,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/workbench/contrib/externalTerminal/node/TerminalHelper.scpt %%DATADIR%%/resources/app/out/vs/workbench/contrib/externalTerminal/node/iTermHelper.scpt %%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js -%%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.nls.js %%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputer.js %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/fake.html %%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/host.js @@ -1221,10 +1234,21 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js %%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html %%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html -%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/ColorTheme.jpg -%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/Extensions.jpg -%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/Languages.jpg -%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/OpenFolder.jpg +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/colorTheme.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/commandPalette.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/extensions.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/forwardPorts.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/github.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/languageExtensions.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/openFolder.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/openVSC.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/pullRequests.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/remoteTerminal.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/runProject.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/settings.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/settingsSync.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/terminal.png +%%DATADIR%%/resources/app/out/vs/workbench/services/gettingStarted/common/media/tutorialVideo.png %%DATADIR%%/resources/app/out/vs/workbench/services/search/node/searchApp.js %%DATADIR%%/resources/app/out/vs/workbench/services/search/node/searchApp.nls.js %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.css