From nobody Sun Mar 05 07:29:43 2023 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 4PTtdN0tx0z3w8Vw; Sun, 5 Mar 2023 07:29:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTtdN0MCLz41Z5; Sun, 5 Mar 2023 07:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678001384; 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=PZvwNdBZ6w4DQbrZ/ypi8MXlATvW4dvsnFKCUihiSME=; b=D5c97y/z4kg8Ld3XDULDzw1+xYfUvySebe9XVb7h02sUOzOZb7AZhTR5zFkdx4ttDZ0s3Z Z4/4Q9pYMIJ8exQPgaLh3975F7H85lqQgnZzYHnlMOVz28IjbzlgeEF/O6rwXvXzVmAKtB OfjED/8svsl4Zbzf+yL21WF640nWyAZckIxsyBlVQZw9M2z45P09vhjCEW37+jEtqNICr2 c6ynEm5Q3t8znJ5hvMlGXb3+bV9cHNzhfz5/eYeZArgUwgxEZ12enPtkUZlBG1I4gpHjtW Zotd1n4+R+Zxln9bKJ3yJihkihP9iQjSSU/g4gddD5rlWWOerQVSCmtsD9Jn9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678001384; 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=PZvwNdBZ6w4DQbrZ/ypi8MXlATvW4dvsnFKCUihiSME=; b=kPdcOK2krRWBkzqF7qkZfBZKQlo+5+h8wHp50gyrHeLSeETRYGyTeQe1EN4Ph8WakmEt2T 4eh2nCjRhtY3jlSnzZULZ7WwAqN/DVehw4J7cKDy1pKkPjf4N+MmUbTabIqpcIEf8GDHAg /V0/giCq+gqr9Iflne1YH9oXJmQ9iBDs/GMbfy1q6e9Jr8ahSgH+bMTf6Sy6764k0RnPFP RZA5bBtYntYlawncjuCTmnufSYA/sM/hCM+5h3ED733JGbYHJwwXW8HEnEspDzvegEfB4n X08OUqxOgdh1UsB2PcmHiFzcR4ivWY6W3WR3BTUavJhJgtgX9A3p/ZfwdOhkdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678001384; a=rsa-sha256; cv=none; b=FrwnFNHLc82c0WfpY4XoFoNeR78lZf942Gr1mlEOg936xn4CynbobygA/9QCBOwn4G2F7/ WHeCcyNVrTe4ztLe5XZZyR9tNWu2/R6E1fXEdY4j3dkLw/n+RUEBK4D61/+mnYYTLs6ikI VVNbxlX05NSzh75tNrdev/FTGD3EuSONEOd9booLYlgKlT7O9SLTaPip74tIAe5FytbcT+ VIS6c02S3oTvJJak6aY4C3fLonSJB8q2D2LE10+DRyveUWsBjA2gbsBFrXFsK3U0mctJrm JgSt1kdNwunrQDQre79fpw+roNwkIKOKkq+xrlwKw4khkXMVTqVXX2C0t9x2GA== 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 4PTtdM6VkYz1BdK; Sun, 5 Mar 2023 07:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3257ThIL059593; Sun, 5 Mar 2023 07:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3257Thpp059592; Sun, 5 Mar 2023 07:29:43 GMT (envelope-from git) Date: Sun, 5 Mar 2023 07:29:43 GMT Message-Id: <202303050729.3257Thpp059592@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: 53d09421acba - main - editors/vscode: update to 1.76.0 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 53d09421acbaad4ce46efb6b79c30f5bfd5adf39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=53d09421acbaad4ce46efb6b79c30f5bfd5adf39 commit 53d09421acbaad4ce46efb6b79c30f5bfd5adf39 Author: Hiroki Tagato AuthorDate: 2023-03-05 07:28:46 +0000 Commit: Hiroki Tagato CommitDate: 2023-03-05 07:29:36 +0000 editors/vscode: update to 1.76.0 Changelog: https://code.visualstudio.com/updates/v1_76 --- editors/vscode/Makefile | 7 ++----- editors/vscode/distinfo | 14 +++++++------- editors/vscode/files/patch-build_gulpfile.vscode.js | 8 ++++---- editors/vscode/files/patch-src_main.js | 4 ++-- editors/vscode/files/patch-src_vs_base_node_ps.ts | 6 +++--- .../vscode/files/patch-src_vs_code_electron-main_app.ts | 4 ++-- ...orkbench_contrib_extensions_browser_extensionEditor.ts | 4 ++-- editors/vscode/pkg-plist | 15 ++++++++------- 8 files changed, 30 insertions(+), 32 deletions(-) diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index a1a6c20c5529..5b49961dfbf5 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.75.1 -PORTREVISION= 1 +DISTVERSION= 1.76.0 CATEGORIES= editors MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ https://nodejs.org/dist/v${NODE_VER}/:node_headers \ @@ -72,7 +71,7 @@ USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 441438abd1ac652551dbe4d408dfcec8a499b8bf +SOURCE_COMMIT_HASH= 92da9481c0904c6adfe372c12da3b7748d74bdcb BINARY_ALIAS= python=${PYTHON_CMD} @@ -190,8 +189,6 @@ pre-build: # copy rg binary files to vscode-ripgrep module directory ${MKDIR} ${WRKSRC}/node_modules/@vscode/ripgrep/bin ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/@vscode/ripgrep/bin - ${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin - ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin ${MKDIR} ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 2b23c8abdab6..c32f774ca168 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1676103646 +TIMESTAMP = 1677920274 SHA256 (vscode/esbuild-freebsd-64-0.15.5.tgz) = d85ff4d09eef7a6f7513ff575cbee9df9c3c41215a1f530678f61fc9b6b43b87 SIZE (vscode/esbuild-freebsd-64-0.15.5.tgz) = 3585090 SHA256 (vscode/esbuild-freebsd-64-0.15.14.tgz) = 23657fcc798d637897bd341830d27b0f4f687694a3f288a0708389dd04318091 SIZE (vscode/esbuild-freebsd-64-0.15.14.tgz) = 3601675 SHA256 (vscode/node-v16.14.2-headers.tar.gz) = 505e1c287e55bb8ec25d2e20d7d87a57b0c2666e1aa7064e0661ad76b60db594 SIZE (vscode/node-v16.14.2-headers.tar.gz) = 562716 -SHA256 (vscode/yarn-offline-cache-1.75.1.tar.gz) = 1a4cd267e7feba226a0148691f6965cca795e40a84aa3828c189aaee781eed9f -SIZE (vscode/yarn-offline-cache-1.75.1.tar.gz) = 608810708 -SHA256 (vscode/vscode-marketplace-exts-1.75.1.tar.gz) = 180cd9f4a31d69d803968a98935ed6305f368aea659b5e107eb195c3a949d769 -SIZE (vscode/vscode-marketplace-exts-1.75.1.tar.gz) = 1732654 -SHA256 (vscode/microsoft-vscode-1.75.1_GH0.tar.gz) = 97500f244eacd66556c2bcf2d9a63b2509e363f9bc8d587c6fc2feb6bb1a5e31 -SIZE (vscode/microsoft-vscode-1.75.1_GH0.tar.gz) = 16380086 +SHA256 (vscode/yarn-offline-cache-1.76.0.tar.gz) = a3fdf83468e5d591b4f05287dd2b74cbb5a5353592fad041f6d8bf5cbe071863 +SIZE (vscode/yarn-offline-cache-1.76.0.tar.gz) = 401721993 +SHA256 (vscode/vscode-marketplace-exts-1.76.0.tar.gz) = c330e48aa72b210b5b2ac739ee5a2e0c88a9d63eccdd11369d59309a255ad112 +SIZE (vscode/vscode-marketplace-exts-1.76.0.tar.gz) = 1728980 +SHA256 (vscode/microsoft-vscode-1.76.0_GH0.tar.gz) = d25de8ef3bcbdf9c5cdc6a1682651cd655c34703bab06d182939d5e0c3e80807 +SIZE (vscode/microsoft-vscode-1.76.0_GH0.tar.gz) = 16445356 diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js index 8e52c8083199..580369e40129 100644 --- a/editors/vscode/files/patch-build_gulpfile.vscode.js +++ b/editors/vscode/files/patch-build_gulpfile.vscode.js @@ -1,11 +1,11 @@ ---- build/gulpfile.vscode.js.orig 2023-01-09 16:16:14 UTC +--- build/gulpfile.vscode.js.orig 2023-02-28 11:07:20 UTC +++ build/gulpfile.vscode.js -@@ -337,7 +337,7 @@ function packageTask(platform, arch, sourceFolderName, +@@ -336,7 +336,7 @@ function packageTask(platform, arch, sourceFolderName, .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()) .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 -- .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true }))) -+ .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))) +- .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })) ++ .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false })) .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true })); if (platform === 'linux') { diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js index 728a924f143c..e2e1c0e5b549 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-01-09 16:16:14 UTC +--- src/main.js.orig 2023-02-28 11:07:20 UTC +++ src/main.js -@@ -172,7 +172,7 @@ function configureCommandlineSwitchesSync(cliArgs) { +@@ -191,7 +191,7 @@ function configureCommandlineSwitchesSync(cliArgs) { 'force-color-profile' ]; 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 8a6f764070d3..ed8df01c6a50 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-02-01 13:32:54 UTC +--- src/vs/base/node/ps.ts.orig 2023-02-28 11:07:20 UTC +++ src/vs/base/node/ps.ts -@@ -225,7 +225,7 @@ export function listProcesses(rootPid: number): Promis +@@ -244,7 +244,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); -@@ -240,7 +240,8 @@ export function listProcesses(rootPid: number): Promis +@@ -259,7 +259,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 c6d0c5274f01..38ce0326f29a 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-02-01 13:32:54 UTC +--- src/vs/code/electron-main/app.ts.orig 2023-02-28 11:07:20 UTC +++ src/vs/code/electron-main/app.ts -@@ -852,7 +852,7 @@ export class CodeApplication extends Disposable { +@@ -853,7 +853,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 b2d18fc5d724..eaee79547973 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-02-01 13:32:54 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2023-02-28 11:07:20 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1735,7 +1735,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1732,7 +1732,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 8e02701b450b..a7da39e74610 100644 --- a/editors/vscode/pkg-plist +++ b/editors/vscode/pkg-plist @@ -358,7 +358,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/markdown-language-features/package.nls.json %%DATADIR%%/resources/app/extensions/markdown-language-features/schemas/package.schema.json %%DATADIR%%/resources/app/extensions/markdown-language-features/server/README.md -%%DATADIR%%/resources/app/extensions/markdown-language-features/server/dist/node/main.js +%%DATADIR%%/resources/app/extensions/markdown-language-features/server/dist/node/workerMain.js %%DATADIR%%/resources/app/extensions/markdown-language-features/server/package.json %%DATADIR%%/resources/app/extensions/markdown-math/README.md %%DATADIR%%/resources/app/extensions/markdown-math/dist/extension.js @@ -801,6 +801,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/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/sqlite3/build/Release/vscode-sqlite3.node %%DATADIR%%/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node @@ -814,7 +815,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules.asar.unpacked/node-pty/lib/worker/conoutSocketWorker.js %%DATADIR%%/resources/app/node_modules.asar.unpacked/spdlog/build/Release/spdlog.node %%DATADIR%%/resources/app/node_modules.asar.unpacked/vscode-oniguruma/release/onig.wasm -%%DATADIR%%/resources/app/node_modules.asar.unpacked/vscode-policy-watcher/build/Release/vscode-policy-watcher.node %%DATADIR%%/resources/app/node_modules.asar.unpacked/windows-foreground-love/build/Release/foreground_love.node %%DATADIR%%/resources/app/node_modules.asar.unpacked/windows-foreground-love/build/Release/obj.target/foreground_love.node %%DATADIR%%/resources/app/out/bootstrap-amd.js @@ -836,11 +836,6 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/base/node/terminateProcess.sh %%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-browser/preload.js %%DATADIR%%/resources/app/out/vs/base/worker/workerMain.js -%%DATADIR%%/resources/app/out/vs/code/electron-browser/sharedProcess/sharedProcess-dev.html -%%DATADIR%%/resources/app/out/vs/code/electron-browser/sharedProcess/sharedProcess.html -%%DATADIR%%/resources/app/out/vs/code/electron-browser/sharedProcess/sharedProcess.js -%%DATADIR%%/resources/app/out/vs/code/electron-browser/sharedProcess/sharedProcessMain.js -%%DATADIR%%/resources/app/out/vs/code/electron-browser/sharedProcess/sharedProcessMain.nls.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-dev.html @@ -862,6 +857,11 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/code/node/cli.nls.js %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.nls.js +%%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcess-dev.html +%%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcess.html +%%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcess.js +%%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcessMain.js +%%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcessMain.nls.js %%DATADIR%%/resources/app/out/vs/editor/common/services/editorSimpleWorker.nls.js %%DATADIR%%/resources/app/out/vs/loader.js %%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/break.mp3 @@ -951,6 +951,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html %%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/worker/textMate.worker.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