From 3556287e0f9417b68e7b053124fd5b7c6dbae77e Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Fri, 8 Oct 2021 20:40:32 +0200 Subject: [PATCH] vscode: update to 1.61.0 --- srcpkgs/vscode/patches/disable-crash-reporter.patch | 12 ++++++------ srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++-- srcpkgs/vscode/patches/product.patch | 4 ++-- srcpkgs/vscode/patches/remove_git_command.patch | 4 ++-- srcpkgs/vscode/template | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index 59553fabf753..17c0b0db545c 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -14,7 +14,7 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index 55303d9a556..ead5d08663f 100644 +index f7b07e49255..576c82f23e8 100644 --- a/src/bootstrap-fork.js +++ b/src/bootstrap-fork.js @@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { @@ -28,7 +28,7 @@ index 55303d9a556..ead5d08663f 100644 require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); diff --git a/src/main.js b/src/main.js -index 9cf737e0649..1d779632498 100644 +index ad838aa245e..e6319e100b9 100644 --- a/src/main.js +++ b/src/main.js @@ -46,22 +46,6 @@ const codeCachePath = getCodeCachePath(); @@ -55,13 +55,13 @@ index 9cf737e0649..1d779632498 100644 // to ensure that no 'logs' folder is created on disk at a // location outside of the portable directory diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index 135f444bdbf..9d207a91bcf 100644 +index 1d71361b942..6452f501e34 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts -@@ -982,7 +982,7 @@ export class CodeApplication extends Disposable { - const argvJSON = JSON.parse(stripComments(argvString)); +@@ -992,7 +992,7 @@ export class CodeApplication extends Disposable { if (argvJSON['enable-crash-reporter'] === undefined) { - const enableCrashReporterSetting = this.configurationService.getValue('telemetry.enableCrashReporter'); + const telemetryConfig = getTelemetryLevel(this.configurationService); + const enableCrashReporterSetting = telemetryConfig >= TelemetryLevel.ERROR; - const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : true; + const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : false; const additionalArgvContent = [ diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch index a6a4bb073dd2..cb0f7962ebf6 100644 --- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch +++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch @@ -1,8 +1,8 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index ad0e4717a66..4b301e85c3d 100644 +index 13c20bed989..c7710af087e 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()) .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 47440585d5de..827b90297879 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index 9010521ca351..3abefe7bd69a 100644 +index 7b60eac641d..c9aeeeecfe6 100644 --- a/product.json +++ b/product.json @@ -22,6 +22,9 @@ @@ -23,4 +23,4 @@ index 9010521ca351..3abefe7bd69a 100644 + }, "builtInExtensions": [ { - "name": "ms-vscode.node-debug", + "name": "ms-vscode.references-view", diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch index e7aeec6fcebf..f3297cc9d5b3 100644 --- a/srcpkgs/vscode/patches/remove_git_command.patch +++ b/srcpkgs/vscode/patches/remove_git_command.patch @@ -1,8 +1,8 @@ diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js -index f86ceb779a9..61acb0a4d10 100644 +index 2433da29e86..8906a3a8cf2 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js -@@ -87,6 +87,3 @@ runtime "${runtime}"`; +@@ -89,6 +89,3 @@ runtime "${runtime}"`; fs.writeFileSync(yarnrcPath, yarnrc, 'utf8'); yarnInstall(watchPath); } diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 3244acb30a9a..2c7ec4950880 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.60.2 +version=1.61.0 revision=1 _electronver=13.3.0 hostmakedepends="pkg-config python nodejs yarn tar git" @@ -11,7 +11,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=34c6a974f95735c4f934c16837ec553613ba9a7f098876871471edcddbbd65a2 +checksum=68bff7284804054cdd38ae3984ecb2a23af86668e23ec2335440dc56a2d1e82a if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"