diff options
Diffstat (limited to 'editors/vscode')
14 files changed, 105 insertions, 60 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 681c385255dd..bc4b226d64bf 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,5 +1,6 @@ PORTNAME= vscode -DISTVERSION= 1.101.0 +DISTVERSION= 1.101.1 +PORTREVISION= 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 \ @@ -68,7 +69,7 @@ USES= desktop-file-utils gl gmake gnome gssapi:mit iconv:wchar_t \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= dfaf44141ea9deb3b4096f7cd6d24e00c147a4b1 +SOURCE_COMMIT_HASH= 18e3a1ec544e6907be1e944a94c496e302073435 BINARY_ALIAS= python=${PYTHON_CMD} diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 35e567e31b67..6abb2ca8eea5 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1749769265 -SHA256 (vscode/vscode-node-modules-1.101.0.tar.gz) = 19b88e65696f4c30b688e78baacfd4041c56bd047bef153afb81d741357bf358 -SIZE (vscode/vscode-node-modules-1.101.0.tar.gz) = 395032316 -SHA256 (vscode/vscode-marketplace-exts-1.101.0.tar.gz) = 10333830c690095bd4d8e802846a991ec42c72718495b0517e236e6bc2ddf324 -SIZE (vscode/vscode-marketplace-exts-1.101.0.tar.gz) = 1708375 -SHA256 (vscode/microsoft-vscode-1.101.0_GH0.tar.gz) = f0890a88193722c201406f9738f483b3348c414b8dbabc079934a6073d069409 -SIZE (vscode/microsoft-vscode-1.101.0_GH0.tar.gz) = 22853199 +TIMESTAMP = 1750365794 +SHA256 (vscode/vscode-node-modules-1.101.1.tar.gz) = 7fdee8be7622f42be9d0658076c0d8c077d79a86250eda38d97dcda98111d1a7 +SIZE (vscode/vscode-node-modules-1.101.1.tar.gz) = 395119485 +SHA256 (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 13c6bd8b7ca7535e6ae1fa5178f56a703b1de7a484ff01d60931a692ec1924c5 +SIZE (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 1708576 +SHA256 (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = fc015daead5b5a14422944af9b04eb241c78d5b7273888c46bb184d6651a7a2b +SIZE (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = 22852405 diff --git a/editors/vscode/files/patch-build_lib_snapshotLoader.ts b/editors/vscode/files/patch-build_lib_snapshotLoader.ts index 2495de98ca7c..81cb08da4a47 100644 --- a/editors/vscode/files/patch-build_lib_snapshotLoader.ts +++ b/editors/vscode/files/patch-build_lib_snapshotLoader.ts @@ -1,11 +1,10 @@ ---- build/lib/snapshotLoader.ts.orig 2022-07-05 18:15:23 UTC +--- build/lib/snapshotLoader.ts.orig 2025-06-11 13:47:56 UTC +++ build/lib/snapshotLoader.ts -@@ -25,7 +25,7 @@ namespace snaps { - break; +@@ -26,6 +26,7 @@ export namespace snaps { case 'win32': -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`; startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`; break; diff --git a/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js new file mode 100644 index 000000000000..ff8ea52e2aa3 --- /dev/null +++ b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_index.js @@ -0,0 +1,15 @@ +--- node_modules/@vscode/deviceid/dist/index.js.orig 2025-06-19 08:48:56 UTC ++++ node_modules/@vscode/deviceid/dist/index.js +@@ -20,8 +20,9 @@ if (process.platform !== "win32" && + Object.defineProperty(exports, "__esModule", { value: true }); + if (process.platform !== "win32" && + process.platform !== "darwin" && +- process.platform !== "linux") { ++ process.platform !== "linux" && ++ process.platform !== "freebsd") { + throw new Error("Unsupported platform"); + } + __exportStar(require("./devdeviceid.js"), exports); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map diff --git a/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js new file mode 100644 index 000000000000..544b9ab8a0a7 --- /dev/null +++ b/editors/vscode/files/patch-node__modules__at_vscode_deviceid_dist_storage.js @@ -0,0 +1,18 @@ +--- node_modules/@vscode/deviceid/dist/storage.js.orig 2025-06-19 08:49:17 UTC ++++ node_modules/@vscode/deviceid/dist/storage.js +@@ -42,7 +42,7 @@ function getDirectory() { + if (process.platform === "darwin") { + folder = path.join(process.env.HOME, "Library", "Application Support"); + } +- else if (process.platform === "linux") { ++ else if (process.platform === "linux" || process.platform === "freebsd") { + folder = + process.env.XDG_CACHE_HOME ?? path.join(process.env.HOME, ".cache"); + } +@@ -78,4 +78,4 @@ exports.setDeviceId = setDeviceId; + } + } + exports.setDeviceId = setDeviceId; +-//# sourceMappingURL=storage.js.map +\ No newline at end of file ++//# sourceMappingURL=storage.js.map diff --git a/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js new file mode 100644 index 000000000000..7759e309ac2d --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_index.js @@ -0,0 +1,15 @@ +--- remote/node_modules/@vscode/deviceid/dist/index.js.orig 2025-06-19 08:49:40 UTC ++++ remote/node_modules/@vscode/deviceid/dist/index.js +@@ -20,8 +20,9 @@ if (process.platform !== "win32" && + Object.defineProperty(exports, "__esModule", { value: true }); + if (process.platform !== "win32" && + process.platform !== "darwin" && +- process.platform !== "linux") { ++ process.platform !== "linux" && ++ process.platform !== "freebsd") { + throw new Error("Unsupported platform"); + } + __exportStar(require("./devdeviceid.js"), exports); +-//# sourceMappingURL=index.js.map +\ No newline at end of file ++//# sourceMappingURL=index.js.map diff --git a/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js new file mode 100644 index 000000000000..14c2e4690dd4 --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules__at_vscode_deviceid_dist_storage.js @@ -0,0 +1,18 @@ +--- remote/node_modules/@vscode/deviceid/dist/storage.js.orig 2025-06-19 08:49:56 UTC ++++ remote/node_modules/@vscode/deviceid/dist/storage.js +@@ -42,7 +42,7 @@ function getDirectory() { + if (process.platform === "darwin") { + folder = path.join(process.env.HOME, "Library", "Application Support"); + } +- else if (process.platform === "linux") { ++ else if (process.platform === "linux" || process.platform === "freebsd") { + folder = + process.env.XDG_CACHE_HOME ?? path.join(process.env.HOME, ".cache"); + } +@@ -78,4 +78,4 @@ exports.setDeviceId = setDeviceId; + } + } + exports.setDeviceId = setDeviceId; +-//# sourceMappingURL=storage.js.map +\ No newline at end of file ++//# sourceMappingURL=storage.js.map diff --git a/editors/vscode/files/patch-scripts_code-perf.js b/editors/vscode/files/patch-scripts_code-perf.js deleted file mode 100644 index 50a32a8d434a..000000000000 --- a/editors/vscode/files/patch-scripts_code-perf.js +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/code-perf.js.orig 2024-03-01 05:22:09 UTC -+++ scripts/code-perf.js -@@ -65,7 +65,7 @@ function getExePath(buildPath) { - case 'darwin': - relativeExePath = path.join('Contents', 'MacOS', 'Electron'); - break; -- case 'linux': { -+ case 'linux': case 'freebsd': { - const product = require(path.join(buildPath, 'resources', 'app', 'product.json')); - relativeExePath = product.applicationName; - break; 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 3608d03c2d1c..3d0cdab9e6bf 100644 --- a/editors/vscode/files/patch-src_vs_base_node_ps.ts +++ b/editors/vscode/files/patch-src_vs_base_node_ps.ts @@ -1,20 +1,10 @@ --- src/vs/base/node/ps.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/base/node/ps.ts -@@ -210,7 +210,7 @@ export function listProcesses(rootPid: number): Promis - - exec('which ps', {}, (err, stdout, stderr) => { - if (err || stderr) { -- if (process.platform !== 'linux') { -+ if (process.platform !== 'linux' && process.platform !== 'freebsd') { - reject(err || new Error(stderr.toString())); - } else { - const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh').fsPath); -@@ -225,7 +225,8 @@ export function listProcesses(rootPid: number): Promis +@@ -225,7 +225,7 @@ export function listProcesses(rootPid: number): Promis } } else { const ps = stdout.toString().trim(); - const args = '-ax -o pid=,ppid=,pcpu=,pmem=,command='; -+ // const args = '-ax -o pid=,ppid=,pcpu=,pmem=,command='; + const args = '-ax -o pid= -o ppid= -o pcpu= -o pmem= -o command='; // Set numeric locale to ensure '.' is used as the decimal separator 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 c9f26abc8701..023e708012a8 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,11 +1,10 @@ ---- src/vs/code/electron-main/app.ts.orig 2025-05-07 12:32:30 UTC +--- src/vs/code/electron-main/app.ts.orig 2025-06-23 07:50:00 UTC +++ src/vs/code/electron-main/app.ts -@@ -989,7 +989,7 @@ export class CodeApplication extends Disposable { - services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); +@@ -990,6 +990,7 @@ export class CodeApplication extends Disposable { break; -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': if (isLinuxSnap) { services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env['SNAP'], process.env['SNAP_REVISION']])); } else { diff --git a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts index 2dd62b78597e..f7b469c06459 100644 --- a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts +++ b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts @@ -1,11 +1,10 @@ --- src/vs/platform/environment/node/userDataPath.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/platform/environment/node/userDataPath.ts -@@ -86,7 +86,7 @@ function doGetUserDataPath(cliArgs: NativeParsedArgs, - case 'darwin': +@@ -87,6 +87,7 @@ function doGetUserDataPath(cliArgs: NativeParsedArgs, appDataPath = join(homedir(), 'Library', 'Application Support'); break; -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': appDataPath = process.env['XDG_CONFIG_HOME'] || join(homedir(), '.config'); break; default: diff --git a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts index a645b7288214..0a8f39531ffe 100644 --- a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts +++ b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts @@ -1,11 +1,10 @@ ---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2025-04-09 23:39:47 UTC +--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/workbench/api/browser/mainThreadTask.ts -@@ -726,7 +726,7 @@ export class MainThreadTask extends Disposable impleme - case 'darwin': +@@ -727,6 +727,7 @@ export class MainThreadTask extends Disposable impleme platform = Platform.Platform.Mac; break; -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': platform = Platform.Platform.Linux; break; default: 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 bfa7d3c484ad..7f52910c6fbe 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,11 +1,14 @@ ---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-04-09 23:39:47 UTC +--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-06-11 13:47:56 UTC +++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts -@@ -1153,7 +1153,7 @@ class CommandsTableRenderer extends Disposable impleme +@@ -1153,7 +1153,10 @@ class CommandsTableRenderer extends Disposable impleme switch (platform) { case 'win32': key = rawKeyBinding.win; break; - case 'linux': key = rawKeyBinding.linux; break; -+ case 'linux': case 'freebsd': key = rawKeyBinding.linux; break; ++ case 'linux': ++ case 'freebsd': ++ key = rawKeyBinding.linux; ++ break; case 'darwin': key = rawKeyBinding.mac; break; } diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index 5278a38c8fc8..5952d2a91663 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,20 +1,20 @@ ---- test/automation/src/electron.ts.orig 2025-05-07 12:32:30 UTC +--- test/automation/src/electron.ts.orig 2025-06-11 13:47:56 UTC +++ test/automation/src/electron.ts -@@ -84,7 +84,7 @@ export function getDevElectronPath(): string { - switch (process.platform) { +@@ -85,6 +85,7 @@ export function getDevElectronPath(): string { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); -- case 'linux': -+ case 'linux': case 'freebsd': + case 'linux': ++ case 'freebsd': return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -97,7 +97,7 @@ export function getBuildElectronPath(root: string): st +@@ -97,7 +98,8 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); - case 'linux': { -+ case 'linux': case 'freebsd': { ++ case 'linux': ++ case 'freebsd': { const product = require(join(root, 'resources', 'app', 'product.json')); return join(root, product.applicationName); } |