git: bc81d77477f7 - main - editors/vscode: update to 1.86.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Feb 2024 07:38:17 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bc81d77477f7b9f496bfc5ea9d4a0238a2f0662c
commit bc81d77477f7b9f496bfc5ea9d4a0238a2f0662c
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-02-05 07:36:42 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-02-05 07:38:02 +0000
editors/vscode: update to 1.86.0
Changelog: https://code.visualstudio.com/updates/v1_86
Reported by: GitHub (watch releases)
---
editors/vscode/Makefile | 7 ++++---
editors/vscode/distinfo | 14 +++++++-------
.../vscode/files/patch-build_npm_postinstall.js | 4 ++--
editors/vscode/files/patch-src_main.js | 6 +++---
.../files/patch-src_vs_base_common_platform.ts | 22 +++++++++++-----------
editors/vscode/files/patch-src_vs_base_node_ps.ts | 6 +++---
.../files/patch-src_vs_code_electron-main_app.ts | 4 ++--
...h_contrib_extensions_browser_extensionEditor.ts | 4 ++--
editors/vscode/pkg-plist | 4 ++--
9 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index b5b976e6e1b0..9901f176b519 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,5 +1,5 @@
PORTNAME= vscode
-DISTVERSION= 1.85.2
+DISTVERSION= 1.86.0
CATEGORIES= editors
MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
@@ -45,6 +45,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libdav1d.so:multimedia/dav1d \
libvpx.so:multimedia/libvpx \
libopenh264.so:multimedia/openh264 \
+ libpipewire-0.3.so:multimedia/pipewire \
libcups.so:print/cups \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
@@ -66,7 +67,7 @@ USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
USE_GITHUB= yes
GH_ACCOUNT= microsoft
-SOURCE_COMMIT_HASH= 8b3775030ed1a69b13e4f4c628c612102e30a681
+SOURCE_COMMIT_HASH= f5442d1f9fcdc7ce89a34c6e52a11ba44e47b423
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -101,7 +102,7 @@ OPTIONS_DEFINE= REH
OPTIONS_DEFAULT=# none
REH_DESC= Build remote extension host
-ELECTRON_DIR= ${.CURDIR}/../../devel/electron25
+ELECTRON_DIR= ${.CURDIR}/../../devel/electron27
.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 b7ccb1a11f1f..023ed3093931 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1705825803
-SHA256 (vscode/yarn-offline-cache-1.85.2.tar.gz) = 7b1415826de4ef3d8ca21ad9f3a5062b67eb6ae82cc4b91f9c8fe112bf57639a
-SIZE (vscode/yarn-offline-cache-1.85.2.tar.gz) = 335437623
-SHA256 (vscode/vscode-marketplace-exts-1.85.2.tar.gz) = 4615e1a5979ae38e84cf7bafac77ebc6334b864811716f4b06e540376d420118
-SIZE (vscode/vscode-marketplace-exts-1.85.2.tar.gz) = 1843668
-SHA256 (vscode/microsoft-vscode-1.85.2_GH0.tar.gz) = 2ef53bc4f8fe97ae5f3c65036207d5bac3433793e8cca7c242b6245d940d48a9
-SIZE (vscode/microsoft-vscode-1.85.2_GH0.tar.gz) = 17197990
+TIMESTAMP = 1707038148
+SHA256 (vscode/yarn-offline-cache-1.86.0.tar.gz) = 0e5f95011d687808a6329e69551585008f4fc6f473dba74a67529b4e7a0416f3
+SIZE (vscode/yarn-offline-cache-1.86.0.tar.gz) = 332998780
+SHA256 (vscode/vscode-marketplace-exts-1.86.0.tar.gz) = 5f30bfd81cd2504a299e55fcb460f1c3247bcef102e3b5f42b4a8fc5e1cce3b5
+SIZE (vscode/vscode-marketplace-exts-1.86.0.tar.gz) = 1826339
+SHA256 (vscode/microsoft-vscode-1.86.0_GH0.tar.gz) = 7dca663af6963cf67cae936cc194a2c0510bf13cabcc705b3b6de006cbfb348c
+SIZE (vscode/microsoft-vscode-1.86.0_GH0.tar.gz) = 17353776
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 6f425b03106d..3a2d535861fa 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 2023-12-06 10:36:56 UTC
+--- build/npm/postinstall.js.orig 2024-01-31 22:36:21 UTC
+++ build/npm/postinstall.js
@@ -41,8 +41,14 @@ function yarnInstall(dir, opts) {
const raw = process.env['npm_config_argv'] || '{}';
@@ -17,7 +17,7 @@
if (opts.ignoreEngines) {
args.push('--ignore-engines');
delete opts.ignoreEngines;
-@@ -111,5 +117,5 @@ for (let dir of dirs) {
+@@ -116,5 +122,5 @@ for (let dir of dirs) {
yarnInstall(dir, opts);
}
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js
index a9385480e8a3..352c2b5f90e8 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-11-01 09:39:20 UTC
+--- src/main.js.orig 2024-01-31 22:36:21 UTC
+++ src/main.js
-@@ -139,7 +139,7 @@ if (locale) {
+@@ -140,7 +140,7 @@ if (locale) {
// Pseudo Language Language Pack is being used.
// In that case, use `en` as the Electron locale.
@@ -9,7 +9,7 @@
const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
app.commandLine.appendSwitch('lang', electronLocale);
}
-@@ -204,7 +204,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+@@ -205,7 +205,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
'force-color-profile'
];
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 a26eff297722..494dafb82da5 100644
--- a/editors/vscode/files/patch-src_vs_base_common_platform.ts
+++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts
@@ -1,6 +1,15 @@
---- src/vs/base/common/platform.ts.orig 2023-12-06 10:36:56 UTC
+--- src/vs/base/common/platform.ts.orig 2024-01-31 22:36:21 UTC
+++ src/vs/base/common/platform.ts
-@@ -81,7 +81,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -79,7 +79,7 @@ if (typeof nodeProcess === 'object') {
+ 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'];
+ _isElectron = isElectronProcess;
+ _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'];
+@@ -107,7 +107,7 @@ else if (typeof navigator === 'object' && !isElectronR
_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;
@@ -9,12 +18,3 @@
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
_isWeb = true;
-@@ -102,7 +102,7 @@ else if (typeof nodeProcess === 'object') {
- 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'];
- _isElectron = isElectronProcess;
- _isCI = !!nodeProcess.env['CI'] || !!nodeProcess.env['BUILD_ARTIFACTSTAGINGDIRECTORY'];
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 85b75025a06e..253ffa966084 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-07-04 10:23:33 UTC
+--- src/vs/base/node/ps.ts.orig 2024-01-31 22:36:21 UTC
+++ src/vs/base/node/ps.ts
-@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis
+@@ -208,7 +208,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
+@@ -223,7 +223,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 07104fef4098..92ce96ac9183 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-12-13 09:08:58 UTC
+--- src/vs/code/electron-main/app.ts.orig 2024-01-31 22:36:21 UTC
+++ src/vs/code/electron-main/app.ts
-@@ -1007,7 +1007,7 @@ export class CodeApplication extends Disposable {
+@@ -1014,7 +1014,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 3de7ceb4fa21..e5097dc606d0 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-12-06 10:36:56 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2024-01-31 22:36:21 UTC
+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1801,7 +1801,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1775,7 +1775,8 @@ export class ExtensionEditor extends EditorPane {
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index 485339078b1c..63f2c2d04d61 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -326,6 +326,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/latex/syntaxes/TeX.tmLanguage.json
%%DATADIR%%/resources/app/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
%%DATADIR%%/resources/app/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/less/build/update-grammar.js
%%DATADIR%%/resources/app/extensions/less/language-configuration.json
%%DATADIR%%/resources/app/extensions/less/package.json
%%DATADIR%%/resources/app/extensions/less/package.nls.json
@@ -483,7 +484,6 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/diagnosticTool.js
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/hash.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/mappings.wasm
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/renameWorker.js
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/targets/node/terminateProcess.sh
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/ui/basic-wat.tmLanguage.json
@@ -806,7 +806,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/vb/package.json
%%DATADIR%%/resources/app/extensions/vb/package.nls.json
%%DATADIR%%/resources/app/extensions/vb/snippets/vb.code-snippets
-%%DATADIR%%/resources/app/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
+%%DATADIR%%/resources/app/extensions/vb/syntaxes/asp-vb-net.tmLanguage.json
%%DATADIR%%/resources/app/extensions/xml/package.json
%%DATADIR%%/resources/app/extensions/xml/package.nls.json
%%DATADIR%%/resources/app/extensions/xml/syntaxes/xml.tmLanguage.json