From 0a098069550db26a70c0b77d3de52b1c5f444546 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Fri, 8 Oct 2021 09:41:56 +0200 Subject: [PATCH] vscode: update to 1.61.0 --- .../patches/disable-crash-reporter.patch | 29 ++++--------------- .../vscode/patches/dont-download-ffmpeg.patch | 4 +-- srcpkgs/vscode/patches/gulp.patch | 4 +-- srcpkgs/vscode/patches/product.patch | 4 +-- .../vscode/patches/remove_git_command.patch | 4 +-- srcpkgs/vscode/template | 4 +-- 6 files changed, 16 insertions(+), 33 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index 59553fabf753..cfab22609757 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -1,20 +1,5 @@ -From afa206dc466066c3d273dfc879103700505b3d7b Mon Sep 17 00:00:00 2001 -From: Joshua Strobl -Date: Sun, 22 Aug 2021 14:02:05 +0300 -Subject: [PATCH 1/1] Disable crash reporter since Microsoft refuses to fix - this upstream. - -Unfortunately a PR submitted by a third-party was rejected by Microsoft, which would change the default for crash reporting from true to false and move the telemetry configuration to ensure crash reporting was not being forced on, placed in the argv.json, and cause a crash when improperly set. - -So, disable it entirely. No cookies for you, Visual Studio Code team. ---- - src/bootstrap-fork.js | 3 --- - src/main.js | 16 ---------------- - src/vs/code/electron-main/app.ts | 2 +- - 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 +13,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,17 +40,15 @@ 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 = [ '', ' // Allows to disable crash reporting.', --- -2.32.0 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/gulp.patch b/srcpkgs/vscode/patches/gulp.patch index 5abb59ec0b65..e6262e2be1ca 100644 --- a/srcpkgs/vscode/patches/gulp.patch +++ b/srcpkgs/vscode/patches/gulp.patch @@ -1,8 +1,8 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index ad0e4717a66..d3c34a95ec9 100644 +index 13c20bed989..d1544185c1f 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op 'resources/win32/code_150x150.png' ], { base: '.' })); } else if (platform === 'linux') { 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"