From nobody Thu Nov 07 07:51:28 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkZ5X1DhVz5cWlx; Thu, 07 Nov 2024 07:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkZ5X0zhgz458Q; Thu, 7 Nov 2024 07:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730965888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxEW/r2BOtuVGh4MGSM+s8eSJ6jDdaR8Ch8033VNMwg=; b=LyBm7gDiiqAfGfNiICTdx1IEVLFPrdTuMFY79uJyOxuhrTy5GiS6A+VdmCVKgpTfNliYNh 79HfdtGszN6iuu1boqcw0gAQg9ohxhkMuSKUaz3XgsegDbuo/sAhf1Wwevlqtpz7qT9mZT E17/ctUc6D68ZrfC8jbTepUYncrXrKiZMyntfdSYw/AMhav+PxfwH6mvthi7MPL1HiyTLT vDUhJhbCqtUBj5HPikCl91HnjfZC3KiGsPuKFgr61mG6X1uViHup4hbHXFTl0Lb/EESmMO 4W0SqOyW/J8ClRkWhHsEDXrAG3dAakpczbmXtBCp4Zs5VIN/e1atVW9hVsW3NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730965888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxEW/r2BOtuVGh4MGSM+s8eSJ6jDdaR8Ch8033VNMwg=; b=ZEv1oOTvDhVpY76QiVtwYC33a+TmW67rZAu2Deys0ZZTZDGhpnQqLEOYJWlFHlX0QGXMcW 1usV/XiyQX2k7Ouv9aNUkpgJxUmEAgJmv9gX5FfZ+fKZB+8m9VMUL/jAF7qYnOkf8PWd7+ iSOrVGSDdd7fLB9rrT6EDEVWYkm9H+eBclSByjBrJfs3hKflXvpaj1Crwim8QIvzRP2MHx 1IaVGVGsRnJ6rA+c/b5tSVbe7GKtJG25bCqfAjg33AGJDWz/L7jmF5r9zxPCsPuHEpFvN7 pJemrdgMfET5J0CF67A/eJNI1KwzF12RChjd3O5MUbezTwj7w3xzV0VVSHy+lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730965888; a=rsa-sha256; cv=none; b=cC9wIaik+Hj3cwjasMDmuFJUqVKHjhtF3qbj8fC1HgHJjofgrritGi0V2mC7v4mx25AFdc 1Dj610POoeaphAhaV1xSsPWPPitOYHHXLShQiDXrjOPyR2GIqwwcLpoVGAgfPxChWvycDE FkKPSwEs4+Qf/tlhEiRWUS/99HahCfWr2qDTiAZweroCUkZD0I/K/GQigtqewSOucgafye +dlbAf6DO2B3RTC7MzAjyLbxLffrtQ36vMHVyS6ogn1TCXfYNoeQ2Is32PTJDlBtjyLtSV GWy4ybDeac4msWYOY8VFpoZaAXhVoXaCCaPrq+8WvKfRxrLRNGERvi40hYJIXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkZ5X0ZV9zcm3; Thu, 7 Nov 2024 07:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A77pSwM095729; Thu, 7 Nov 2024 07:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A77pSPe095726; Thu, 7 Nov 2024 07:51:28 GMT (envelope-from git) Date: Thu, 7 Nov 2024 07:51:28 GMT Message-Id: <202411070751.4A77pSPe095726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 259e6da8bff9 - main - editors/vscode: update to 1.95.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 259e6da8bff911b4c426959c668f90719fa24c57 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=259e6da8bff911b4c426959c668f90719fa24c57 commit 259e6da8bff911b4c426959c668f90719fa24c57 Author: Hiroki Tagato AuthorDate: 2024-11-07 07:49:26 +0000 Commit: Hiroki Tagato CommitDate: 2024-11-07 07:51:12 +0000 editors/vscode: update to 1.95.1 Changelog: https://code.visualstudio.com/updates/v1_95 Reported by: GitHub (watch releases) --- editors/vscode/Makefile | 26 ++++++------ editors/vscode/distinfo | 14 +++---- .../vscode/files/patch-build_lib_layersChecker.ts | 4 +- .../patch-node__modules_node-pty_src_unix_pty.cc | 14 ------- ...h-remote_node__modules_node-pty_src_unix_pty.cc | 14 ------- ...otstrap-node.js => patch-src_bootstrap-node.ts} | 8 ++-- .../files/{patch-src_main.js => patch-src_main.ts} | 8 ++-- .../files/patch-src_vs_code_electron-main_app.ts | 4 +- ...rc_vs_platform_environment_node_userDataPath.js | 11 ------ ...rc_vs_platform_environment_node_userDataPath.ts | 11 ++++++ ...-src_vs_workbench_api_browser_mainThreadTask.ts | 4 +- ..._services_actions_common_menusExtensionPoint.ts | 11 ++++++ editors/vscode/pkg-plist | 46 +++++++++++++--------- 13 files changed, 83 insertions(+), 92 deletions(-) diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 04e1246cf446..3c06994bf7e2 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.94.2 -PORTREVISION= 1 +DISTVERSION= 1.95.1 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules DISTFILES= vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \ @@ -25,6 +24,7 @@ BUILD_DEPENDS= zip:archivers/zip \ npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ + libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libsndio.so:audio/sndio \ @@ -70,7 +70,7 @@ USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 384ff7382de624fb94dbaf6da11977bba1ecd427 +SOURCE_COMMIT_HASH= 65edc4939843c90c34d61f4ce11704f09d3e5cb6 BINARY_ALIAS= python=${PYTHON_CMD} @@ -99,7 +99,7 @@ MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 NODEJS_DIR= ${.CURDIR:H:H}/www/node20 .include "${NODEJS_DIR}/Makefile.version" -ELECTRON_DIR= ${.CURDIR:H:H}/devel/electron30 +ELECTRON_DIR= ${.CURDIR:H:H}/devel/electron32 .include "${ELECTRON_DIR}/Makefile.version" ELECTRON_DOWNLOAD_URL= https://github.com/electron/electron/releases/download/v${ELECTRON_VER} @@ -220,6 +220,8 @@ do-build: @cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \ ${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \ ${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt +# remove backup files so that they are not included in the package + @${FIND} ${WRKSRC} -type f \( -name '*.orig' -o -name '*~' \) -delete # build and package vscode cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx tsc -p build/tsconfig.build.json cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ @@ -249,8 +251,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png @${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} && \ - ${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR} + ${TAR} -cf - -C ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} . | \ + ${TAR} -xf - -C ${STAGEDIR}${DATADIR} @${FIND} ${STAGEDIR}${DATADIR}/resources/app -type f -exec ${FILE} {} ';' | \ ${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD} .for f in chromedriver mksnapshot v8_context_snapshot_generator @@ -265,8 +267,8 @@ do-install: pre-test: # setup electron dependency for unit tests @${MKDIR} ${WRKSRC}/.build/electron - @cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \ - ${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron + @${TAR} -cf - -C ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} . | \ + ${TAR} -xf - -C ${WRKSRC}/.build/electron @cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss do-test: @@ -287,12 +289,11 @@ build-remote-extension-host: configure pre-build npm_config_nodedir=${LOCALBASE} \ npm --userconfig=${WRKSRC}/remote/.npmrc run gulp vscode-reh-linux-${ELECTRON_ARCH}-min @${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} - cd ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} && ${TAR} -cf - . | \ + ${TAR} -cf - -C ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} . | \ ${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} @${FIND} ${WRKDIR}/vscode-reh -type f -exec ${FILE} {} ';' | \ ${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD} - cd ${WRKDIR}/vscode-reh && \ - ${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz . + ${TAR} -czf ${WRKDIR}/vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz -C ${WRKDIR}/vscode-reh . # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run gulp vscode-reh-web-linux-${ELECTRON_ARCH}-min ### targets for port maintainer(s) @@ -316,7 +317,6 @@ make-marketplace-exts-archive: extract @${RM} -r ${WRKSRC}/.build/builtInExtensions @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} npm run download-builtin-extensions - @cd ${WRKSRC}/.build && \ - ${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions + @${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/.build builtInExtensions .include diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 210286a52695..4e91d19fd392 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1728633458 -SHA256 (vscode/vscode-node-modules-1.94.2.tar.gz) = b2aa9b456680c543a1a664bf3e1d6f78c0f2221bd965ac68dd74c2c6107da535 -SIZE (vscode/vscode-node-modules-1.94.2.tar.gz) = 407150173 -SHA256 (vscode/vscode-marketplace-exts-1.94.2.tar.gz) = 35b4f9f7946871b1227a4e67822693c84c02f419c93b5b213aa9e33f102fcd32 -SIZE (vscode/vscode-marketplace-exts-1.94.2.tar.gz) = 1614018 -SHA256 (vscode/microsoft-vscode-1.94.2_GH0.tar.gz) = 398a73d3d1ff1b9e962b461518ac4506c7970aa8a99030060287651e16a804e2 -SIZE (vscode/microsoft-vscode-1.94.2_GH0.tar.gz) = 20297397 +TIMESTAMP = 1730807347 +SHA256 (vscode/vscode-node-modules-1.95.1.tar.gz) = ce7e2f9edc29c924c709f9225acdcdf5b7f8f4a2a143b68182e1e2b728d3ba3d +SIZE (vscode/vscode-node-modules-1.95.1.tar.gz) = 398179623 +SHA256 (vscode/vscode-marketplace-exts-1.95.1.tar.gz) = 44bdd685d9a5470a8a1bc4b33cc796cd7dbd7a469070c74287732fc610d0396c +SIZE (vscode/vscode-marketplace-exts-1.95.1.tar.gz) = 1617401 +SHA256 (vscode/microsoft-vscode-1.95.1_GH0.tar.gz) = 89c280e9d84cdd41f0acec0b2cfc900bb46af5ef323c1f5f1073d506935f324e +SIZE (vscode/microsoft-vscode-1.95.1_GH0.tar.gz) = 20332995 diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts index 54032352ad24..061c8ce6362e 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-09-27 21:08:28 UTC +--- build/lib/layersChecker.ts.orig 2024-10-31 05:10:14 UTC +++ build/lib/layersChecker.ts -@@ -382,7 +382,7 @@ function createProgram(tsconfigPath: string): ts.Progr +@@ -403,7 +403,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-node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/patch-node__modules_node-pty_src_unix_pty.cc deleted file mode 100644 index f812be7e032f..000000000000 --- a/editors/vscode/files/patch-node__modules_node-pty_src_unix_pty.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- node_modules/node-pty/src/unix/pty.cc.orig 2024-09-09 06:45:53 UTC -+++ node_modules/node-pty/src/unix/pty.cc -@@ -66,6 +66,11 @@ - #include - #endif - -+/* for termios */ -+#if defined(__FreeBSD__) -+#include -+#endif -+ - /* NSIG - macro for highest signal + 1, should be defined */ - #ifndef NSIG - #define NSIG 32 diff --git a/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc deleted file mode 100644 index ea5b97790aff..000000000000 --- a/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- remote/node_modules/node-pty/src/unix/pty.cc.orig 2024-09-09 06:45:53 UTC -+++ remote/node_modules/node-pty/src/unix/pty.cc -@@ -66,6 +66,11 @@ - #include - #endif - -+/* for termios */ -+#if defined(__FreeBSD__) -+#include -+#endif -+ - /* NSIG - macro for highest signal + 1, should be defined */ - #ifndef NSIG - #define NSIG 32 diff --git a/editors/vscode/files/patch-src_bootstrap-node.js b/editors/vscode/files/patch-src_bootstrap-node.ts similarity index 52% rename from editors/vscode/files/patch-src_bootstrap-node.js rename to editors/vscode/files/patch-src_bootstrap-node.ts index 0b2bfafcb055..022b1269478d 100644 --- a/editors/vscode/files/patch-src_bootstrap-node.js +++ b/editors/vscode/files/patch-src_bootstrap-node.ts @@ -1,11 +1,11 @@ ---- src/bootstrap-node.js.orig 2024-09-27 21:08:28 UTC -+++ src/bootstrap-node.js -@@ -169,7 +169,7 @@ module.exports.configurePortable = function (product) +--- src/bootstrap-node.ts.orig 2024-10-31 05:10:14 UTC ++++ src/bootstrap-node.ts +@@ -122,7 +122,7 @@ export function configurePortable(product: Partial