summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroki Tagato <tagattie@FreeBSD.org>2024-06-08 07:22:53 +0900
committerHiroki Tagato <tagattie@FreeBSD.org>2024-06-08 07:24:59 +0900
commite0776945fd6a164ae242bfe211276748999f5e6a (patch)
treec9314f435500eb42c98269ea62b2bb4737a3f8ab
parentdevel/git-tui: Terminal interface for some git commands (diff)
editors/vscode: update to 1.90.0
Changelog: https://code.visualstudio.com/updates/v1_90 Reported by: GitHub (watch releases)
-rw-r--r--editors/vscode/Makefile12
-rw-r--r--editors/vscode/distinfo14
-rw-r--r--editors/vscode/files/patch-build_lib_layersChecker.ts4
-rw-r--r--editors/vscode/files/patch-build_npm_postinstall.js6
-rw-r--r--editors/vscode/files/patch-src_main.js6
-rw-r--r--editors/vscode/files/patch-src_vs_code_electron-main_app.ts4
-rw-r--r--editors/vscode/pkg-plist13
7 files changed, 30 insertions, 29 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index d5ceb2a19622..c20b1027a94f 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
PORTNAME= vscode
-DISTVERSION= 1.89.1
-PORTREVISION= 1
+DISTVERSION= 1.90.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 \
@@ -23,7 +22,6 @@ BUILD_DEPENDS= zip:archivers/zip \
yarn-node${NODE_VER_MAJOR}>0:www/yarn-node${NODE_VER_MAJOR}
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libatspi.so:accessibility/at-spi2-core \
- libsnappy.so:archivers/snappy \
libFLAC.so:audio/flac \
libopus.so:audio/opus \
libsndio.so:audio/sndio \
@@ -68,7 +66,7 @@ USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
USE_GITHUB= yes
GH_ACCOUNT= microsoft
-SOURCE_COMMIT_HASH= dc96b837cf6bb4af9cd736aa3af08cf8279f7685
+SOURCE_COMMIT_HASH= 89de5a8d4d6205e5b11647eb6a74844ca23d2573
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -79,8 +77,8 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
-# Keep NODE_VER in sync with www/node18 DISTVERSION
-NODE_VER= 18.20.2
+# Keep NODE_VER in sync with www/node20 DISTVERSION
+NODE_VER= 20.14.0
NODE_VER_MAJOR= ${NODE_VER:C/\..*$//}
SHEBANG_REGEX= ./(extensions|resources|scripts|src)/.*\.sh$$
@@ -103,7 +101,7 @@ OPTIONS_DEFINE= REH
OPTIONS_DEFAULT=# none
REH_DESC= Build remote extension host
-ELECTRON_DIR= ${.CURDIR}/../../devel/electron28
+ELECTRON_DIR= ${.CURDIR}/../../devel/electron29
.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 95cfdfed8875..b637b76ce171 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1715417665
-SHA256 (vscode/yarn-offline-cache-1.89.1.tar.gz) = f381e2e06effb3ae04eabe84216629fe94d31310eb3912970da776a56c0c92a8
-SIZE (vscode/yarn-offline-cache-1.89.1.tar.gz) = 344425717
-SHA256 (vscode/vscode-marketplace-exts-1.89.1.tar.gz) = 2ab21dd6176cf7444f7f300cf2bf26e36f57160f6825d10c93b9cff19c119b4e
-SIZE (vscode/vscode-marketplace-exts-1.89.1.tar.gz) = 1847982
-SHA256 (vscode/microsoft-vscode-1.89.1_GH0.tar.gz) = fee0a6b8fd1a06a164a737050e839fbb60cab49ba2db48215b59c62a06fd7ce0
-SIZE (vscode/microsoft-vscode-1.89.1_GH0.tar.gz) = 18465813
+TIMESTAMP = 1717654847
+SHA256 (vscode/yarn-offline-cache-1.90.0.tar.gz) = 1073e3df0e20fbcfd9ed8977d4cbd7acd792c49f989f2f96f99a1bfd33bc4540
+SIZE (vscode/yarn-offline-cache-1.90.0.tar.gz) = 343213582
+SHA256 (vscode/vscode-marketplace-exts-1.90.0.tar.gz) = 8af8dbe21c6e0c83b673558f608d4330dd22af41ea10632f2cc7568ffdfe2f39
+SIZE (vscode/vscode-marketplace-exts-1.90.0.tar.gz) = 1846580
+SHA256 (vscode/microsoft-vscode-1.90.0_GH0.tar.gz) = bb093f22235dce2083374b3fad56cd036228e96c29a96e1a9063c8aa7ef042e4
+SIZE (vscode/microsoft-vscode-1.90.0_GH0.tar.gz) = 19641868
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index db11f83ea2bf..cda7c9e80b83 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 2023-12-06 10:36:56 UTC
+--- build/lib/layersChecker.ts.orig 2024-06-03 21:50:45 UTC
+++ build/lib/layersChecker.ts
-@@ -338,7 +338,7 @@ function createProgram(tsconfigPath: string): ts.Progr
+@@ -408,7 +408,7 @@ function createProgram(tsconfigPath: string): ts.Progr
function createProgram(tsconfigPath: string): ts.Program {
const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 6d991878d2bd..f820434ba72d 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,6 +1,6 @@
---- build/npm/postinstall.js.orig 2024-02-07 08:28:46 UTC
+--- build/npm/postinstall.js.orig 2024-06-03 21:50:45 UTC
+++ build/npm/postinstall.js
-@@ -41,8 +41,14 @@ function yarnInstall(dir, opts) {
+@@ -42,8 +42,14 @@ function yarnInstall(dir, opts) {
const raw = process.env['npm_config_argv'] || '{}';
const argv = JSON.parse(raw);
const original = argv.original || [];
@@ -17,7 +17,7 @@
if (opts.ignoreEngines) {
args.push('--ignore-engines');
delete opts.ignoreEngines;
-@@ -131,5 +137,5 @@ for (let dir of dirs) {
+@@ -132,5 +138,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 352c2b5f90e8..38f75b0716e6 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 2024-01-31 22:36:21 UTC
+--- src/main.js.orig 2024-06-03 21:50:45 UTC
+++ src/main.js
@@ -140,7 +140,7 @@ if (locale) {
// Pseudo Language Language Pack is being used.
@@ -9,8 +9,8 @@
const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
app.commandLine.appendSwitch('lang', electronLocale);
}
-@@ -205,7 +205,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
- 'force-color-profile'
+@@ -208,7 +208,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+ 'disable-lcd-text'
];
- if (process.platform === 'linux') {
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 9ee19e105133..fa9ded323c4c 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 2024-04-03 11:03:33 UTC
+--- src/vs/code/electron-main/app.ts.orig 2024-06-03 21:50:45 UTC
+++ src/vs/code/electron-main/app.ts
-@@ -1017,7 +1017,7 @@ export class CodeApplication extends Disposable {
+@@ -1020,7 +1020,7 @@ export class CodeApplication extends Disposable {
services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
break;
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index 5eebe0396eb5..e00bffbd0d4c 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -824,6 +824,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/yaml/syntaxes/yaml.tmLanguage.json
%%DATADIR%%/resources/app/node_modules.asar
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@parcel/watcher/build/Release/watcher.node
+%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/deviceid/build/Release/windows.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/spdlog/build/Release/spdlog.node
@@ -861,11 +862,6 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/base/worker/workerMain.js
%%DATADIR%%/resources/app/out/vs/code/electron-main/main.js
%%DATADIR%%/resources/app/out/vs/code/electron-main/main.nls.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/issue/issueReporter.html
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/issue/issueReporter.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/issue/issueReporterMain.css
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/issue/issueReporterMain.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/issue/issueReporterMain.nls.js
%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorer.html
%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorer.js
%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.css
@@ -897,6 +893,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/progress.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/quickFixes.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/save.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/success.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/taskCompleted.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/taskFailed.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/terminalBell.mp3
@@ -906,6 +903,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
%%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.nls.js
%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.js
+%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.nls.js
%%DATADIR%%/resources/app/out/vs/platform/terminal/node/ptyHostMain.js
%%DATADIR%%/resources/app/out/vs/platform/terminal/node/ptyHostMain.nls.js
%%DATADIR%%/resources/app/out/vs/workbench/api/node/extensionHostProcess.js
@@ -928,6 +926,11 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/extensions/browser/media/theme-icon.png
%%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/issue/electron-sandbox/issueReporter.html
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.css
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.js
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.nls.js
%%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