git: 9982b1721cda - main - editors/vscode: update to 1.84.0

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Fri, 03 Nov 2023 13:55:48 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9982b1721cda72ee3e30008350c09763b115b34a

commit 9982b1721cda72ee3e30008350c09763b115b34a
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-11-03 13:53:58 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-11-03 13:55:40 +0000

    editors/vscode: update to 1.84.0
    
    Changelog: https://code.visualstudio.com/updates/v1_84
    
    Reported by:    GitHub (watch releases)
---
 editors/vscode/Makefile                                    | 12 ++++++++----
 editors/vscode/distinfo                                    | 14 +++++++-------
 editors/vscode/files/patch-product.json                    |  4 ++--
 editors/vscode/files/patch-src_main.js                     |  8 ++++----
 .../vscode/files/patch-src_vs_code_electron-main_app.ts    |  4 ++--
 ...workbench_contrib_extensions_browser_extensionEditor.ts |  4 ++--
 editors/vscode/pkg-plist                                   | 11 ++++++++++-
 7 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index dcf053a46d4d..6b55352bccbe 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.83.1
-PORTREVISION=	2
+DISTVERSION=	1.84.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 \
@@ -67,7 +66,7 @@ USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	f1b07bd25dfad64b0167beb15359ae573aecd2cc
+SOURCE_COMMIT_HASH=	d037ac076cee195194f93ce6fe2bdfe2969cc82d
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
@@ -79,7 +78,7 @@ USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 USE_LDCONFIG=	${DATADIR}
 
 # Keep NODE_VER in sync with www/node18 DISTVERSION
-NODE_VER=	18.18.0
+NODE_VER=	18.18.2
 NODE_VER_MAJOR=	${NODE_VER:C/\..*$//}
 
 SHEBANG_REGEX=	./(extensions|resources|scripts|src)/.*\.sh$$
@@ -215,6 +214,11 @@ do-build:
 	cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt
+	# add newline character at the end of the file if not already
+	${AWK} '1' ${WRKSRC}/build/checksums/electron.txt > \
+		${WRKSRC}/build/checksums/electron.txt.new
+	${MV} -f ${WRKSRC}/build/checksums/electron.txt.new \
+		${WRKSRC}/build/checksums/electron.txt
 	cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index cf1ac6217cd1..276dd7786f1c 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1697178490
-SHA256 (vscode/yarn-offline-cache-1.83.1.tar.gz) = cf22841613b221a7ac69c635fb2a73328f737f660c33886b41f0ff0392ba8924
-SIZE (vscode/yarn-offline-cache-1.83.1.tar.gz) = 334078092
-SHA256 (vscode/vscode-marketplace-exts-1.83.1.tar.gz) = d3df55c3d8c8ac3e9444642b9ac9119fdd61512f89870a93a4f364577261f52f
-SIZE (vscode/vscode-marketplace-exts-1.83.1.tar.gz) = 1755683
-SHA256 (vscode/microsoft-vscode-1.83.1_GH0.tar.gz) = 45c563424dfbff6e80c5621b5ecc1b7276141c944c1fa39401a98a800b576410
-SIZE (vscode/microsoft-vscode-1.83.1_GH0.tar.gz) = 17167986
+TIMESTAMP = 1698914533
+SHA256 (vscode/yarn-offline-cache-1.84.0.tar.gz) = 57e666af2c989e9cd74544156e3c9e5f6c5e0eb65b60cd0252376b782407d1fe
+SIZE (vscode/yarn-offline-cache-1.84.0.tar.gz) = 334827323
+SHA256 (vscode/vscode-marketplace-exts-1.84.0.tar.gz) = 9c72311f40096b5cb823c22478f92af99584d52187250b6a986d7e3177a2adc2
+SIZE (vscode/vscode-marketplace-exts-1.84.0.tar.gz) = 1728524
+SHA256 (vscode/microsoft-vscode-1.84.0_GH0.tar.gz) = 85d5964044cce63870a51c973d2dc6a0f63a3f42dd319cdaf59259f309078031
+SIZE (vscode/microsoft-vscode-1.84.0_GH0.tar.gz) = 17329952
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index 5f6914f55ce6..36f209e7faea 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,6 +1,6 @@
---- product.json.orig	2023-07-04 10:23:33 UTC
+--- product.json.orig	2023-11-01 09:39:20 UTC
 +++ product.json
-@@ -33,6 +33,16 @@
+@@ -31,6 +31,16 @@
  	"nodejsRepository": "https://nodejs.org",
  	"urlProtocol": "code-oss",
  	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js
index 2375cc8af39e..a9385480e8a3 100644
--- a/editors/vscode/files/patch-src_main.js
+++ b/editors/vscode/files/patch-src_main.js
@@ -1,4 +1,4 @@
---- src/main.js.orig	2023-07-04 10:23:33 UTC
+--- src/main.js.orig	2023-11-01 09:39:20 UTC
 +++ src/main.js
 @@ -139,7 +139,7 @@ if (locale) {
  // Pseudo Language Language Pack is being used.
@@ -9,12 +9,12 @@
  	const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
  	app.commandLine.appendSwitch('lang', electronLocale);
  }
-@@ -207,7 +207,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
- 		'password-store'
+@@ -204,7 +204,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+ 		'force-color-profile'
  	];
  
 -	if (process.platform === 'linux') {
 +	if (process.platform === 'linux' || process.platform === 'freebsd') {
- 
  		// Force enable screen readers on Linux via this flag
  		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 b9f7d82c4d7e..49766d31ecfc 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-10-03 13:06:11 UTC
+--- src/vs/code/electron-main/app.ts.orig	2023-11-01 09:39:20 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -921,7 +921,7 @@ export class CodeApplication extends Disposable {
+@@ -978,7 +978,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 429d02b2b6fa..66c1c62baa27 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-10-03 13:06:11 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2023-11-01 09:39:20 UTC
 +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1741,7 +1741,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1778,7 +1778,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 a3fb8bb14043..c47ebd3faf1a 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -275,6 +275,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ini/syntaxes/ini.tmLanguage.json
 %%DATADIR%%/resources/app/extensions/ipynb/README.md
 %%DATADIR%%/resources/app/extensions/ipynb/dist/ipynbMain.js
+%%DATADIR%%/resources/app/extensions/ipynb/media/icon.png
 %%DATADIR%%/resources/app/extensions/ipynb/notebook-out/cellAttachmentRenderer.js
 %%DATADIR%%/resources/app/extensions/ipynb/package.json
 %%DATADIR%%/resources/app/extensions/ipynb/package.nls.json
@@ -488,8 +489,11 @@ share/applications/code-oss.desktop
 %%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
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/vendor/acorn-loose.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/vendor/acorn.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/w32appcontainertokens-XTRA77NA.node
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/watchdog.js
 %%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md
@@ -606,6 +610,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/zh-tw/diagnosticMessages.generated.json
 %%DATADIR%%/resources/app/extensions/node_modules/typescript/package.json
 %%DATADIR%%/resources/app/extensions/notebook-renderers/README.md
+%%DATADIR%%/resources/app/extensions/notebook-renderers/media/icon.png
 %%DATADIR%%/resources/app/extensions/notebook-renderers/package.json
 %%DATADIR%%/resources/app/extensions/notebook-renderers/package.nls.json
 %%DATADIR%%/resources/app/extensions/notebook-renderers/renderer-out/index.js
@@ -674,6 +679,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/ruby/package.json
 %%DATADIR%%/resources/app/extensions/ruby/package.nls.json
 %%DATADIR%%/resources/app/extensions/ruby/syntaxes/ruby.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/rust/build/update-grammar.mjs
 %%DATADIR%%/resources/app/extensions/rust/language-configuration.json
 %%DATADIR%%/resources/app/extensions/rust/package.json
 %%DATADIR%%/resources/app/extensions/rust/package.nls.json
@@ -849,6 +855,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/base/node/cpuUsage.sh
 %%DATADIR%%/resources/app/out/vs/base/node/ps.sh
 %%DATADIR%%/resources/app/out/vs/base/node/terminateProcess.sh
+%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload-slim.js
 %%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload.js
 %%DATADIR%%/resources/app/out/vs/base/worker/workerMain.js
 %%DATADIR%%/resources/app/out/vs/code/electron-main/main.js
@@ -880,12 +887,15 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived2.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived3.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived4.mp3
+%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/clear.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineDeleted.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineInserted.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineModified.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/error.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/foldedAreas.mp3
+%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/format.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/quickFixes.mp3
+%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/save.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/taskCompleted.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/taskFailed.mp3
 %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/terminalBell.mp3
@@ -960,7 +970,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.js
 %%DATADIR%%/resources/app/out/vs/workbench/services/search/worker/localFileSearch.js
 %%DATADIR%%/resources/app/out/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.js
-%%DATADIR%%/resources/app/out/vs/workbench/services/voiceRecognition/electron-sandbox/voiceTranscriptionWorklet.js
 %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.css
 %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.js
 %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.nls.js