diff options
| -rw-r--r-- | editors/vscode/Makefile | 25 | ||||
| -rw-r--r-- | editors/vscode/distinfo | 14 | ||||
| -rw-r--r-- | editors/vscode/files/patch-build_lib_layersChecker.ts | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_bootstrap.js | 2 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_main.js | 11 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_code_electron-main_app.ts | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts | 2 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts | 2 | ||||
| -rw-r--r-- | editors/vscode/files/patch-test_integration_browser_src_index.ts | 11 | ||||
| -rw-r--r-- | editors/vscode/files/patch-test_smoke_src_main.ts | 38 | ||||
| -rw-r--r-- | editors/vscode/pkg-plist | 29 |
11 files changed, 86 insertions, 56 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index c9686c5b762d..aced01b05144 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vscode -DISTVERSION= 1.42.1 -PORTREVISION= 1 +DISTVERSION= 1.43.0 CATEGORIES= editors MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \ https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache @@ -10,9 +9,6 @@ DISTFILES= 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} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ - yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} \ - vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= tagattie@yandex.com COMMENT= Visual Studio Code - Open Source ("Code - OSS") @@ -65,7 +61,7 @@ USES= desktop-file-utils gl gmake gnome jpeg pkgconfig \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= c47d83b293181d9be64f27ff093689e8e7aed054 +SOURCE_COMMIT_HASH= 78a4c91400152c0f27ba4d363eb56d2835f9903a BINARY_ALIAS= python=${PYTHON_CMD} @@ -90,7 +86,7 @@ MAKE_ENV+= BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH} \ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 \ XDG_CACHE_HOME=${WRKDIR}/.cache -ELECTRON_DIR= ${.CURDIR}/../../devel/electron6 +ELECTRON_DIR= ${.CURDIR}/../../devel/electron7 .include "${ELECTRON_DIR}/Makefile.version" pre-everything:: @@ -102,19 +98,6 @@ pre-everything:: @${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096" @${ECHO_MSG} "" -post-extract: - # setup node headers for node-gyp - ${MKDIR} ${WRKDIR}/.cache/node-gyp/${NODE_VER} - ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/node-v${NODE_VER}-headers${EXTRACT_SUFX} \ - --strip-components 1 -C ${WRKDIR}/.cache/node-gyp/${NODE_VER} - ${ECHO_CMD} 9 > ${WRKDIR}/.cache/node-gyp/${NODE_VER}/installVersion - # setup electron download cache for UI smoke tests - # ${MKDIR} ${WRKDIR}/.cache/electron - # ${SED} -e 's/freebsd${OSREL:R}/freebsd/' ${DISTDIR}/${DIST_SUBDIR}/SHASUMS256.txt > \ - # ${WRKDIR}/.cache/electron/SHASUMS256.txt-${ELECTRON_VER} - # ${CP} ${DISTDIR}/${DIST_SUBDIR}/electron-v${ELECTRON_VER}-freebsd${OSREL:R}-x64.zip \ - # ${WRKDIR}/.cache/electron/electron-v${ELECTRON_VER}-freebsd-x64.zip - post-patch: # force use of electron version matching port one ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \ @@ -122,6 +105,8 @@ post-patch: # setup yarnrc for using local node headers ${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \ ${WRKSRC}/.yarnrc + ${ECHO_CMD} 'nodedir "${WRKDIR}/node-v${NODE_VER}"' >> \ + ${WRKSRC}/remote/.yarnrc # setup yarnrc for offline node_modules installation ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \ ${WRKSRC}/.yarnrc diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 2c532af6bde1..cf13af3367b4 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1581742520 +TIMESTAMP = 1584069208 SHA256 (vscode/node-v12.4.0-headers.tar.gz) = 3a5bbb6ad1a5f3ba912981c13910d7c617bb8fa6b6ae2026d6aee2edcd590a45 SIZE (vscode/node-v12.4.0-headers.tar.gz) = 549161 -SHA256 (vscode/yarn-offline-cache-1.42.1.tar.gz) = 2053dd126a4c4235441f22b7b0ac16c4dd1747387ccbe7196f1d86c1bb37f9ae -SIZE (vscode/yarn-offline-cache-1.42.1.tar.gz) = 118563800 -SHA256 (vscode/vscode-marketplace-exts-1.42.1.tar.gz) = ffefdf437361398d1cff4bbea0467c00b910fd7cdb2f2f690f421757782d8005 -SIZE (vscode/vscode-marketplace-exts-1.42.1.tar.gz) = 2553625 -SHA256 (vscode/microsoft-vscode-1.42.1_GH0.tar.gz) = f810fdf81f808700db53df977b56e7b638c22d53ea0e21b6a3be5ba7fbf4801b -SIZE (vscode/microsoft-vscode-1.42.1_GH0.tar.gz) = 10013642 +SHA256 (vscode/yarn-offline-cache-1.43.0.tar.gz) = 3f85edb1b8c8a88eba38b51a6e635f7f8c504e817b372fdc9996e5d301769e48 +SIZE (vscode/yarn-offline-cache-1.43.0.tar.gz) = 122753954 +SHA256 (vscode/vscode-marketplace-exts-1.43.0.tar.gz) = 95e1df6e71dcd8c6341fcc52832e88d12f39794bcd51e20a9692de5bd699966a +SIZE (vscode/vscode-marketplace-exts-1.43.0.tar.gz) = 2610437 +SHA256 (vscode/microsoft-vscode-1.43.0_GH0.tar.gz) = c8a56f7f551054bbfd8b9b0ed3a741f112427764dfcaf33c82f4da3125c760fe +SIZE (vscode/microsoft-vscode-1.43.0_GH0.tar.gz) = 10169834 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); + } diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist index 92ea9c7c00a3..f0d4773448a7 100644 --- a/editors/vscode/pkg-plist +++ b/editors/vscode/pkg-plist @@ -237,6 +237,25 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/git/syntaxes/git-commit.tmLanguage.json %%DATADIR%%/resources/app/extensions/git/syntaxes/git-rebase.tmLanguage.json %%DATADIR%%/resources/app/extensions/git/syntaxes/ignore.tmLanguage.json +%%DATADIR%%/resources/app/extensions/github-authentication/.gitignore +%%DATADIR%%/resources/app/extensions/github-authentication/README.md +%%DATADIR%%/resources/app/extensions/github-authentication/build/postinstall.js +%%DATADIR%%/resources/app/extensions/github-authentication/dist/common/config.json +%%DATADIR%%/resources/app/extensions/github-authentication/dist/extension.js +%%DATADIR%%/resources/app/extensions/github-authentication/extension.webpack.config.js +%%DATADIR%%/resources/app/extensions/github-authentication/package.json +%%DATADIR%%/resources/app/extensions/github-authentication/package.nls.json +%%DATADIR%%/resources/app/extensions/github-authentication/src/common/clientRegistrar.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/common/config.json +%%DATADIR%%/resources/app/extensions/github-authentication/src/common/keychain.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/common/logger.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/common/utils.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/extension.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/github.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/githubServer.ts +%%DATADIR%%/resources/app/extensions/github-authentication/src/typings/ref.d.ts +%%DATADIR%%/resources/app/extensions/github-authentication/tsconfig.json +%%DATADIR%%/resources/app/extensions/github-authentication/yarn.lock %%DATADIR%%/resources/app/extensions/go/language-configuration.json %%DATADIR%%/resources/app/extensions/go/package.json %%DATADIR%%/resources/app/extensions/go/package.nls.json @@ -417,6 +436,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/resources/logo.png %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/resources/logo.svg %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/src/bootloader.js +%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/src/chromehash_bg.wasm %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/src/extension.js %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/src/hash.js %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-nightly/src/mappings.wasm @@ -432,7 +452,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/autoAttach.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/cluster.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/configurationProvider.nls.metadata.json -%%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/loadedScripts.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/processPicker.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/extension/protocolDetection.nls.metadata.json %%DATADIR%%/resources/app/extensions/ms-vscode.node-debug/dist/node/nodeDebug.nls.metadata.json @@ -876,8 +895,10 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2019.object.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2019.string.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2019.symbol.d.ts +%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.bigint.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.full.d.ts +%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.promise.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.string.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es5.d.ts @@ -1169,7 +1190,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/lib/index.d.ts %%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/lib/index.js %%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/package.json -%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/yarn.lock %%DATADIR%%/resources/app/extensions/typescript-language-features/package.json %%DATADIR%%/resources/app/extensions/typescript-language-features/package.nls.json %%DATADIR%%/resources/app/extensions/typescript-language-features/schemas/jsconfig.schema.json @@ -1181,10 +1201,13 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/vb/snippets/vb.json %%DATADIR%%/resources/app/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json %%DATADIR%%/resources/app/extensions/vscode-account/dist/extension.js +%%DATADIR%%/resources/app/extensions/vscode-account/dist/nls.metadata.header.json +%%DATADIR%%/resources/app/extensions/vscode-account/dist/nls.metadata.json %%DATADIR%%/resources/app/extensions/vscode-account/extension.webpack.config.js %%DATADIR%%/resources/app/extensions/vscode-account/media/auth.css %%DATADIR%%/resources/app/extensions/vscode-account/media/auth.html %%DATADIR%%/resources/app/extensions/vscode-account/package.json +%%DATADIR%%/resources/app/extensions/vscode-account/package.nls.json %%DATADIR%%/resources/app/extensions/vscode-account/yarn.lock %%DATADIR%%/resources/app/extensions/xml/package.json %%DATADIR%%/resources/app/extensions/xml/package.nls.json @@ -1335,10 +1358,10 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/package.json %%DATADIR%%/resources/app/product.json %%DATADIR%%/resources/app/resources/linux/code.png -%%DATADIR%%/resources/electron.asar %%DATADIR%%/snapshot_blob.bin %%DATADIR%%/swiftshader/libEGL.so %%DATADIR%%/swiftshader/libGLESv2.so +%%DATADIR%%/swiftshader/libvk_swiftshader.so %%DATADIR%%/v8_context_snapshot.bin share/pixmaps/com.visualstudio.code.oss.png share/zsh/site-functions/_code-oss |