git: 8d16ed9f3800 - main - editors/vscode: update to 1.91.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 14 Jul 2024 14:43:09 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8d16ed9f38006524000801ce709d1c34a3c835a1
commit 8d16ed9f38006524000801ce709d1c34a3c835a1
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-07-14 14:40:53 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-07-14 14:42:53 +0000
editors/vscode: update to 1.91.1
While here, convert to use USES=nodejs and make use of provided
variables by nodejs.mk.
Reported by: GitHub (watch releases)
---
editors/vscode/Makefile | 28 ++++++++++------------
editors/vscode/distinfo | 14 +++++------
.../vscode/files/patch-build_lib_layersChecker.ts | 4 ++--
editors/vscode/files/patch-src_main.js | 6 ++---
...rc_vs_platform_environment_node_userDataPath.js | 4 ++--
editors/vscode/pkg-plist | 4 ++++
6 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index fdd84bd3c638..6b96797c8f4a 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
PORTNAME= vscode
-DISTVERSION= 1.90.2
-PORTREVISION= 1
+DISTVERSION= 1.91.1
CATEGORIES= editors
MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
@@ -19,8 +18,8 @@ ONLY_FOR_ARCHS= amd64
BUILD_DEPENDS= zip:archivers/zip \
electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
rg:textproc/ripgrep \
- npm-node${NODE_VER_MAJOR}>0:www/npm-node${NODE_VER_MAJOR} \
- yarn-node${NODE_VER_MAJOR}>0:www/yarn-node${NODE_VER_MAJOR}
+ npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} \
+ yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libatspi.so:accessibility/at-spi2-core \
libFLAC.so:audio/flac \
@@ -62,12 +61,13 @@ TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR}
bash:shells/bash
USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags pkgconfig python:build shebangfix xorg
+ localbase:ldflags nodejs:20,build pkgconfig python:build \
+ shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= microsoft
-SOURCE_COMMIT_HASH= 5437499feb04f7a586f677b155b039bc2b3669eb
+SOURCE_COMMIT_HASH= f1e16e1e6214d7c44d078b1f0607b2388f29d729
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -78,10 +78,6 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
-# 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$$
PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts
@@ -102,8 +98,10 @@ OPTIONS_DEFINE= REH
OPTIONS_DEFAULT=# none
REH_DESC= Build remote extension host
-ELECTRON_DIR= ${.CURDIR}/../../devel/electron29
-.include "${ELECTRON_DIR}/Makefile.version"
+NODEJS_DIR= ${.CURDIR:H:H}/www/node20
+.include "${NODEJS_DIR}/Makefile.version"
+ELECTRON_DIR= ${.CURDIR:H:H}/devel/electron29
+.include "${ELECTRON_DIR}/Makefile.version"
ELECTRON_DOWNLOAD_URL= https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
ELECTRON_DOWNLOAD_URL_HASH!= /sbin/sha256 -q -s ${ELECTRON_DOWNLOAD_URL}
@@ -126,7 +124,7 @@ post-patch:
${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \
${WRKSRC}/.yarnrc
# force use of node version matching port one
- ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${NODE_VER}\2|' \
+ ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${NODEJS_PORTVERSION}\2|' \
${WRKSRC}/remote/.yarnrc
# setup yarnrc for using local node headers
${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \
@@ -231,8 +229,8 @@ do-build:
do-build-REH-on:
# setup download cache for node
- ${MKDIR} ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64
- ${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64
+ ${MKDIR} ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-x64
+ ${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-x64
# build vscode remote extension host
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 7427d87a9ee7..a4520acab739 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1719130953
-SHA256 (vscode/yarn-offline-cache-1.90.2.tar.gz) = 825af87ec9e819cb3ce02dfdebe77206450b2338af38c1a6a0aedf1c47b55cc3
-SIZE (vscode/yarn-offline-cache-1.90.2.tar.gz) = 343215509
-SHA256 (vscode/vscode-marketplace-exts-1.90.2.tar.gz) = 02c2dc67496f9fb2684ce6fd049b9430895890d7c1aa674056db2d77781c04f5
-SIZE (vscode/vscode-marketplace-exts-1.90.2.tar.gz) = 1844883
-SHA256 (vscode/microsoft-vscode-1.90.2_GH0.tar.gz) = e0d398ed7acdc41af5e458782def63768f1ac1e7b14e4ba304143b405fd60a06
-SIZE (vscode/microsoft-vscode-1.90.2_GH0.tar.gz) = 19641023
+TIMESTAMP = 1720815682
+SHA256 (vscode/yarn-offline-cache-1.91.1.tar.gz) = 0bd9dc229deff9d77a28880067dc306fd93824905ab8ffa3aa90f546d8864d21
+SIZE (vscode/yarn-offline-cache-1.91.1.tar.gz) = 341936179
+SHA256 (vscode/vscode-marketplace-exts-1.91.1.tar.gz) = 7624804ee86f8832aaa5bfd0028472c65ae723d1dd2f6f84525b1be5c339a1ef
+SIZE (vscode/vscode-marketplace-exts-1.91.1.tar.gz) = 1850165
+SHA256 (vscode/microsoft-vscode-1.91.1_GH0.tar.gz) = d2ed726dd34d2e8e71d40b09c0ea648bf9b37b15982b39dddcb70d0cbfcdb45e
+SIZE (vscode/microsoft-vscode-1.91.1_GH0.tar.gz) = 19728923
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index cda7c9e80b83..72e66db7635f 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 2024-06-03 21:50:45 UTC
+--- build/lib/layersChecker.ts.orig 2024-07-09 12:51:23 UTC
+++ build/lib/layersChecker.ts
-@@ -408,7 +408,7 @@ function createProgram(tsconfigPath: string): ts.Progr
+@@ -361,7 +361,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-src_main.js b/editors/vscode/files/patch-src_main.js
index 38f75b0716e6..48998fb75eca 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-06-03 21:50:45 UTC
+--- src/main.js.orig 2024-07-09 12:51:23 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);
}
-@@ -208,7 +208,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
- 'disable-lcd-text'
+@@ -211,7 +211,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+ 'proxy-bypass-list'
];
- if (process.platform === 'linux') {
diff --git a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
index 51385f6aa864..f8f4534b06cd 100644
--- a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
+++ b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
@@ -1,6 +1,6 @@
---- src/vs/platform/environment/node/userDataPath.js.orig 2022-10-12 10:08:52 UTC
+--- src/vs/platform/environment/node/userDataPath.js.orig 2024-07-09 12:51:23 UTC
+++ src/vs/platform/environment/node/userDataPath.js
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@
case 'darwin':
appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
break;
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index e00bffbd0d4c..68e7a077c6e7 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -585,8 +585,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2023.collection.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2023.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2023.full.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es2023.intl.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es5.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.es6.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.array.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.collection.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.decorators.d.ts
@@ -595,6 +597,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.intl.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.object.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.promise.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.regexp.d.ts
+%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.esnext.string.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.scripthost.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.webworker.asynciterable.d.ts
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/lib.webworker.d.ts