summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/vscode/Makefile16
-rw-r--r--editors/vscode/distinfo14
-rw-r--r--editors/vscode/files/patch-build_checker_layersChecker.ts (renamed from editors/vscode/files/patch-build_lib_layersChecker.ts)6
-rw-r--r--editors/vscode/files/patch-build_lib_electron.ts13
-rw-r--r--editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js10
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts4
-rw-r--r--editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts5
-rw-r--r--editors/vscode/pkg-plist33
8 files changed, 64 insertions, 37 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 71f1a26ad21e..e7387e9b3cde 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
PORTNAME= vscode
-DISTVERSION= 1.101.2
-PORTREVISION= 4
+DISTVERSION= 1.102.0
CATEGORIES= editors
MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules
DISTFILES= vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \
@@ -69,7 +68,7 @@ USES= desktop-file-utils gl gmake gnome gssapi:mit iconv:wchar_t \
USE_GITHUB= yes
GH_ACCOUNT= microsoft
-SOURCE_COMMIT_HASH= 2901c5ac6db8a986a5666c3af51ff804d05af0d4
+SOURCE_COMMIT_HASH= cb0c47c0cfaad0757385834bd89d410c78a856c0
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -210,17 +209,6 @@ do-build:
@${MKDIR} ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}
@cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
zip -q -r ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}/electron-v${ELECTRON_VER}-linux-${ELECTRON_ARCH}.zip .
- @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
# 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
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index c39714bbf8fa..c70fcb967393 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1750968241
-SHA256 (vscode/vscode-node-modules-1.101.2.tar.gz) = 84aab8d4b3f220ea94c9533c33be10fb66c518cdb2e0b643f563319cc4d39533
-SIZE (vscode/vscode-node-modules-1.101.2.tar.gz) = 395151117
-SHA256 (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 49e723dbfff85988adbb55815b0bcf5632449d3bb16a4a578b7caf9f4d468c26
-SIZE (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 1714638
-SHA256 (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = d65d04e68ae04a372b1c6b13d0e8a72e2c919e491d4c3b2dcf997b22fc25a509
-SIZE (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = 22853707
+TIMESTAMP = 1752295250
+SHA256 (vscode/vscode-node-modules-1.102.0.tar.gz) = b20409a7872c142ca0b54bd02385c9bfd7cce3e6c9379b05302e5074f2209575
+SIZE (vscode/vscode-node-modules-1.102.0.tar.gz) = 394103842
+SHA256 (vscode/vscode-marketplace-exts-1.102.0.tar.gz) = 4f6a3d2f11e1e41960d16fe1b732bd6328194302088e6fbe02892fcc24bcae92
+SIZE (vscode/vscode-marketplace-exts-1.102.0.tar.gz) = 1709494
+SHA256 (vscode/microsoft-vscode-1.102.0_GH0.tar.gz) = 2d48c358a22d12c2bc024673d08300b3dd45c6859f8a3e4d16480100b16a0a31
+SIZE (vscode/microsoft-vscode-1.102.0_GH0.tar.gz) = 22977577
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_checker_layersChecker.ts
index 5f572328ac0a..96e2a0540fc3 100644
--- a/editors/vscode/files/patch-build_lib_layersChecker.ts
+++ b/editors/vscode/files/patch-build_checker_layersChecker.ts
@@ -1,6 +1,6 @@
---- build/lib/layersChecker.ts.orig 2025-06-11 13:47:56 UTC
-+++ build/lib/layersChecker.ts
-@@ -363,7 +363,7 @@ function createProgram(tsconfigPath: string): ts.Progr
+--- build/checker/layersChecker.ts.orig 2025-07-12 04:56:20 UTC
++++ build/checker/layersChecker.ts
+@@ -136,7 +136,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_lib_electron.ts b/editors/vscode/files/patch-build_lib_electron.ts
new file mode 100644
index 000000000000..c89cd63f67f6
--- /dev/null
+++ b/editors/vscode/files/patch-build_lib_electron.ts
@@ -0,0 +1,13 @@
+--- build/lib/electron.ts.orig 2025-07-09 22:00:36 UTC
++++ build/lib/electron.ts
+@@ -199,8 +199,9 @@ export const config = {
+ winIcon: 'resources/win32/code.ico',
+ token: process.env['GITHUB_TOKEN'],
+ repo: product.electronRepository || undefined,
+- validateChecksum: true,
++ validateChecksum: false,
+ checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'),
++ unsafelyDisableChecksums: true,
+ };
+
+ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
diff --git a/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js
new file mode 100644
index 000000000000..dc29d0c61156
--- /dev/null
+++ b/editors/vscode/files/patch-node__modules__at_vscode_gulp-electron_src_download.js
@@ -0,0 +1,10 @@
+--- node_modules/@vscode/gulp-electron/src/download.js.orig 2025-07-12 11:54:58 UTC
++++ node_modules/@vscode/gulp-electron/src/download.js
+@@ -103,6 +103,7 @@ async function download(opts) {
+ artifactName: opts.artifactName,
+ artifactSuffix: opts.artifactSuffix,
+ token: opts.token,
++ unsafelyDisableChecksums: opts.unsafelyDisableChecksums,
+ downloadOptions: {
+ getProgressCallback: (progress) => {
+ if (bar) bar.update(progress.percent);
diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
index 7f52910c6fbe..efeed8cb2bfd 100644
--- a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-06-11 13:47:56 UTC
+--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-07-09 22:00:36 UTC
+++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts
-@@ -1153,7 +1153,10 @@ class CommandsTableRenderer extends Disposable impleme
+@@ -1174,7 +1174,10 @@ class CommandsTableRenderer extends Disposable impleme
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
index 806c996a9a00..82233b967353 100644
--- a/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
+++ b/editors/vscode/files/patch-test_smoke_src_areas_terminal_terminal.test.ts
@@ -1,4 +1,4 @@
---- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-04-11 12:34:55 UTC
+--- test/smoke/src/areas/terminal/terminal.test.ts.orig 2025-07-09 22:00:36 UTC
+++ test/smoke/src/areas/terminal/terminal.test.ts
@@ -39,15 +39,15 @@ export function setup(logger: Logger) {
// https://github.com/microsoft/vscode/issues/216564
@@ -10,14 +10,13 @@
- setupTerminalProfileTests({ skipSuite: process.platform === 'linux' });
- setupTerminalTabsTests({ skipSuite: process.platform === 'linux' });
- setupTerminalShellIntegrationTests({ skipSuite: process.platform === 'linux' });
-- setupTerminalStickyScrollTests({ skipSuite: process.platform === 'linux' });
+ setupTerminalEditorsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalInputTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalPersistenceTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalProfileTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalTabsTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalShellIntegrationTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
-+ setupTerminalStickyScrollTests({ skipSuite: (process.platform === 'linux' || process.platform === 'freebsd') });
+ setupTerminalStickyScrollTests({ skipSuite: true });
// https://github.com/microsoft/vscode/pull/141974
// Windows is skipped here as well as it was never enabled from the start
- setupTerminalSplitCwdTests({ skipSuite: process.platform === 'linux' || process.platform === 'win32' });
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index dfc2df095ca2..c0283641539b 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -205,6 +205,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/github-authentication/dist/extension.js.LICENSE.txt
%%DATADIR%%/resources/app/extensions/github-authentication/images/icon.png
%%DATADIR%%/resources/app/extensions/github-authentication/media/auth.css
+%%DATADIR%%/resources/app/extensions/github-authentication/media/code-icon.svg
%%DATADIR%%/resources/app/extensions/github-authentication/media/favicon.ico
%%DATADIR%%/resources/app/extensions/github-authentication/media/icon.png
%%DATADIR%%/resources/app/extensions/github-authentication/media/index.html
@@ -693,9 +694,6 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/prompt-basics/language-configuration.json
%%DATADIR%%/resources/app/extensions/prompt-basics/package.json
%%DATADIR%%/resources/app/extensions/prompt-basics/package.nls.json
-%%DATADIR%%/resources/app/extensions/prompt-basics/snippets/chatmode.code-snippets
-%%DATADIR%%/resources/app/extensions/prompt-basics/snippets/instructions.code-snippets
-%%DATADIR%%/resources/app/extensions/prompt-basics/snippets/prompt.code-snippets
%%DATADIR%%/resources/app/extensions/prompt-basics/syntaxes/prompt.tmLanguage.json
%%DATADIR%%/resources/app/extensions/pug/language-configuration.json
%%DATADIR%%/resources/app/extensions/pug/package.json
@@ -1230,6 +1228,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules/buffer/LICENSE
%%DATADIR%%/resources/app/node_modules/buffer/index.js
%%DATADIR%%/resources/app/node_modules/buffer/package.json
+%%DATADIR%%/resources/app/node_modules/bundle-name/index.js
+%%DATADIR%%/resources/app/node_modules/bundle-name/license
+%%DATADIR%%/resources/app/node_modules/bundle-name/package.json
%%DATADIR%%/resources/app/node_modules/chownr/LICENSE
%%DATADIR%%/resources/app/node_modules/chownr/chownr.js
%%DATADIR%%/resources/app/node_modules/chownr/package.json
@@ -1282,6 +1283,13 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules/deep-extend/index.js
%%DATADIR%%/resources/app/node_modules/deep-extend/lib/deep-extend.js
%%DATADIR%%/resources/app/node_modules/deep-extend/package.json
+%%DATADIR%%/resources/app/node_modules/default-browser-id/index.js
+%%DATADIR%%/resources/app/node_modules/default-browser-id/license
+%%DATADIR%%/resources/app/node_modules/default-browser-id/package.json
+%%DATADIR%%/resources/app/node_modules/default-browser/index.js
+%%DATADIR%%/resources/app/node_modules/default-browser/license
+%%DATADIR%%/resources/app/node_modules/default-browser/package.json
+%%DATADIR%%/resources/app/node_modules/default-browser/windows.js
%%DATADIR%%/resources/app/node_modules/define-lazy-prop/index.js
%%DATADIR%%/resources/app/node_modules/define-lazy-prop/license
%%DATADIR%%/resources/app/node_modules/define-lazy-prop/package.json
@@ -1454,6 +1462,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules/is-glob/LICENSE
%%DATADIR%%/resources/app/node_modules/is-glob/index.js
%%DATADIR%%/resources/app/node_modules/is-glob/package.json
+%%DATADIR%%/resources/app/node_modules/is-inside-container/cli.js
+%%DATADIR%%/resources/app/node_modules/is-inside-container/index.js
+%%DATADIR%%/resources/app/node_modules/is-inside-container/license
+%%DATADIR%%/resources/app/node_modules/is-inside-container/package.json
%%DATADIR%%/resources/app/node_modules/is-number/LICENSE
%%DATADIR%%/resources/app/node_modules/is-number/index.js
%%DATADIR%%/resources/app/node_modules/is-number/package.json
@@ -1683,6 +1695,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules/readable-stream/package.json
%%DATADIR%%/resources/app/node_modules/readable-stream/readable-browser.js
%%DATADIR%%/resources/app/node_modules/readable-stream/readable.js
+%%DATADIR%%/resources/app/node_modules/run-applescript/index.js
+%%DATADIR%%/resources/app/node_modules/run-applescript/license
+%%DATADIR%%/resources/app/node_modules/run-applescript/package.json
%%DATADIR%%/resources/app/node_modules/safe-buffer/LICENSE
%%DATADIR%%/resources/app/node_modules/safe-buffer/index.js
%%DATADIR%%/resources/app/node_modules/safe-buffer/package.json
@@ -2047,6 +2062,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/media/code-icon.svg
%%DATADIR%%/resources/app/out/media/codicon.ttf
%%DATADIR%%/resources/app/out/media/github.svg
+%%DATADIR%%/resources/app/out/media/google-mono-dark.svg
+%%DATADIR%%/resources/app/out/media/google-mono-light.svg
%%DATADIR%%/resources/app/out/media/google.svg
%%DATADIR%%/resources/app/out/media/letterpress-dark.svg
%%DATADIR%%/resources/app/out/media/letterpress-hcDark.svg
@@ -2061,10 +2078,10 @@ 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-aux.js
-%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.html
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.js
+%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-browser/preload-aux.js
+%%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-browser/preload.js
+%%DATADIR%%/resources/app/out/vs/code/electron-browser/workbench/workbench.html
+%%DATADIR%%/resources/app/out/vs/code/electron-browser/workbench/workbench.js
%%DATADIR%%/resources/app/out/vs/code/electron-utility/sharedProcess/sharedProcessMain.js
%%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js
%%DATADIR%%/resources/app/out/vs/editor/common/languages/highlights/css.scm
@@ -2105,7 +2122,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3
%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/warning.mp3
%%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
-%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.js
+%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.js
%%DATADIR%%/resources/app/out/vs/platform/terminal/node/ptyHostMain.js
%%DATADIR%%/resources/app/out/vs/workbench/api/node/extensionHostProcess.js
%%DATADIR%%/resources/app/out/vs/workbench/api/worker/extensionHostWorkerMain.js
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 03:51:25 +0000