Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.61.0
@ 2021-10-08  7:56 atk
  2021-10-08  8:01 ` [PR REVIEW] " paper42
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: atk @ 2021-10-08  7:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]

There is a new pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.61.0
https://github.com/void-linux/void-packages/pull/33421

vscode: update to 1.61.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33421.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.61.0-33421.patch --]
[-- Type: text/x-diff, Size: 7301 bytes --]

From 0a098069550db26a70c0b77d3de52b1c5f444546 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
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 <joshua@streambits.io>
-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 <realtiaz@gmail.com>"
 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
@ 2021-10-08  8:01 ` paper42
  2021-10-08  8:02 ` paper42
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-10-08  8:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r724788180

Comment:
Why are you changing this patch? It should still apply even if it shifted by one line.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
  2021-10-08  8:01 ` [PR REVIEW] " paper42
@ 2021-10-08  8:02 ` paper42
  2021-10-08  8:20 ` atk
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-10-08  8:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r724788536

Comment:
leave this in the patch please

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
  2021-10-08  8:01 ` [PR REVIEW] " paper42
  2021-10-08  8:02 ` paper42
@ 2021-10-08  8:20 ` atk
  2021-10-08  8:22 ` [PR PATCH] [Updated] " atk
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-08  8:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r724801526

Comment:
I usually check the patches for warning or error messages and create them new when I get one.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (2 preceding siblings ...)
  2021-10-08  8:20 ` atk
@ 2021-10-08  8:22 ` atk
  2021-10-08  8:22 ` [PR REVIEW] " atk
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-08  8:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.61.0
https://github.com/void-linux/void-packages/pull/33421

vscode: update to 1.61.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33421.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.61.0-33421.patch --]
[-- Type: text/x-diff, Size: 6565 bytes --]

From 55483e9463792a01f566e08c0617ec24748cb61e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 8 Oct 2021 10:22:21 +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/gulp.patch                   |  4 ++--
 srcpkgs/vscode/patches/product.patch                |  4 ++--
 srcpkgs/vscode/patches/remove_git_command.patch     |  4 ++--
 srcpkgs/vscode/template                             |  4 ++--
 6 files changed, 16 insertions(+), 16 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/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 <realtiaz@gmail.com>"
 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (3 preceding siblings ...)
  2021-10-08  8:22 ` [PR PATCH] [Updated] " atk
@ 2021-10-08  8:22 ` atk
  2021-10-08 15:45 ` paper42
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-08  8:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r724803469

Comment:
Oops, forgot to put it back. Sorry, fixed it.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (4 preceding siblings ...)
  2021-10-08  8:22 ` [PR REVIEW] " atk
@ 2021-10-08 15:45 ` paper42
  2021-10-08 18:40 ` [PR PATCH] [Updated] " atk
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-10-08 15:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r725121393

Comment:
I think we should prefer keeping the diffs small and clean to refreshing the patches just because the code moved by one line. `patch(1)` can fix this and the message is just for your information.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (5 preceding siblings ...)
  2021-10-08 15:45 ` paper42
@ 2021-10-08 18:40 ` atk
  2021-10-08 18:42 ` [PR REVIEW] " atk
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-08 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.61.0
https://github.com/void-linux/void-packages/pull/33421

vscode: update to 1.61.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33421.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.61.0-33421.patch --]
[-- Type: text/x-diff, Size: 5764 bytes --]

From 3556287e0f9417b68e7b053124fd5b7c6dbae77e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
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 <realtiaz@gmail.com>"
 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (6 preceding siblings ...)
  2021-10-08 18:40 ` [PR PATCH] [Updated] " atk
@ 2021-10-08 18:42 ` atk
  2021-10-08 19:45 ` paper42
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-08 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r725229331

Comment:
I have removed this change. I won't update patches that will only warn about line shifts in the future then if that's your preference.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (7 preceding siblings ...)
  2021-10-08 18:42 ` [PR REVIEW] " atk
@ 2021-10-08 19:45 ` paper42
  2021-10-10 18:51 ` atk
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-10-08 19:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r725261473

Comment:
There are two more patch changes in this PR which only change the line numbers, could you remove them?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (8 preceding siblings ...)
  2021-10-08 19:45 ` paper42
@ 2021-10-10 18:51 ` atk
  2021-10-10 19:14 ` [PR PATCH] [Updated] " atk
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-10 18:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#discussion_r725681720

Comment:
Oops, overlooked that message. I'm on it.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (9 preceding siblings ...)
  2021-10-10 18:51 ` atk
@ 2021-10-10 19:14 ` atk
  2021-10-11 20:03 ` atk
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-10 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.61.0
https://github.com/void-linux/void-packages/pull/33421

vscode: update to 1.61.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33421.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.61.0-33421.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]

From 15fad54b9fe71cb2c7494f8e11bb4ecb0a3fe298 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sun, 10 Oct 2021 21:14:47 +0200
Subject: [PATCH] vscode: update to 1.61.0

---
 srcpkgs/vscode/patches/disable-crash-reporter.patch | 12 ++++++------
 srcpkgs/vscode/patches/product.patch                |  4 ++--
 srcpkgs/vscode/template                             |  4 ++--
 3 files changed, 10 insertions(+), 10 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/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/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 <realtiaz@gmail.com>"
 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (10 preceding siblings ...)
  2021-10-10 19:14 ` [PR PATCH] [Updated] " atk
@ 2021-10-11 20:03 ` atk
  2021-10-12  6:11 ` [PR PATCH] [Merged]: " paper42
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-11 20:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.61.0
https://github.com/void-linux/void-packages/pull/33421

vscode: update to 1.61.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33421.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.61.0-33421.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]

From 0f836f318afbd7e86d454e5b316bca188ed7ea65 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sun, 10 Oct 2021 21:14:47 +0200
Subject: [PATCH] vscode: update to 1.61.0

---
 srcpkgs/vscode/patches/disable-crash-reporter.patch | 12 ++++++------
 srcpkgs/vscode/patches/product.patch                |  4 ++--
 srcpkgs/vscode/template                             |  4 ++--
 3 files changed, 10 insertions(+), 10 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/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/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 <realtiaz@gmail.com>"
 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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Merged]: vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (11 preceding siblings ...)
  2021-10-11 20:03 ` atk
@ 2021-10-12  6:11 ` paper42
  2021-10-12 14:17 ` q66
  2021-10-12 19:37 ` atk
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-10-12  6:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]

There's a merged pull request on the void-packages repository

vscode: update to 1.61.0
https://github.com/void-linux/void-packages/pull/33421

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (12 preceding siblings ...)
  2021-10-12  6:11 ` [PR PATCH] [Merged]: " paper42
@ 2021-10-12 14:17 ` q66
  2021-10-12 19:37 ` atk
  14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2021-10-12 14:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3656 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#issuecomment-941055869

Comment:
this broke stuff, it's no longer using ripgrep from system

```
gyp info it worked if it ends with ok
gyp info using node-gyp@7.1.2
gyp info using node@16.9.1 | linux | ppc64
13.3.0
gyp info ok 
yarn install v1.22.10
$ node build/npm/preinstall.js
[1/4] Resolving packages...
[2/4] Fetching packages...
info fsevents@2.3.1: The platform "linux" is incompatible with this module.
info "fsevents@2.3.1" is an optional dependency and failed compatibility check. Excluding it from installation.
info vscode-windows-ca-certs@0.3.0: The platform "linux" is incompatible with this module.
info "vscode-windows-ca-certs@0.3.0" is an optional dependency and failed compatibility check. Excluding it from installation.
info fsevents@2.1.1: The platform "linux" is incompatible with this module.
info "fsevents@2.1.1" is an optional dependency and failed compatibility check. Excluding it from installation.
info fsevents@1.2.13: The platform "linux" is incompatible with this module.
info "fsevents@1.2.13" is an optional dependency and failed compatibility check. Excluding it from installation.
info fsevents@2.1.3: The platform "linux" is incompatible with this module.
info "fsevents@2.1.3" is an optional dependency and failed compatibility check. Excluding it from installation.
info vscode-windows-registry@1.0.3: The platform "linux" is incompatible with this module.
info "vscode-windows-registry@1.0.3" is an optional dependency and failed compatibility check. Excluding it from installation.
info windows-mutex@0.4.1: The platform "linux" is incompatible with this module.
info "windows-mutex@0.4.1" is an optional dependency and failed compatibility check. Excluding it from installation.
info windows-process-tree@0.3.0: The platform "linux" is incompatible with this module.
info "windows-process-tree@0.3.0" is an optional dependency and failed compatibility check. Excluding it from installation.
[3/4] Linking dependencies...
warning " > css-loader@3.2.0" has incorrect peer dependency "webpack@^4.0.0".
warning " > eslint-plugin-header@3.1.1" has incorrect peer dependency "eslint@>=7.7.0".
warning " > file-loader@4.2.0" has incorrect peer dependency "webpack@^4.0.0".
warning " > gulp-postcss@9.0.0" has unmet peer dependency "postcss@^8.0.0".
warning " > gulp-tsb@4.0.6" has incorrect peer dependency "typescript@^3.0.0".
warning " > sinon-test@3.1.0" has incorrect peer dependency "sinon@2.x - 10.x".
warning " > style-loader@1.0.0" has incorrect peer dependency "webpack@^4.0.0".
[4/4] Building fresh packages...
error /builddir/vscode-1.61.0/node_modules/vscode-ripgrep: Command failed.
Exit code: 1
Command: node ./lib/postinstall.js
Arguments: 
Directory: /builddir/vscode-1.61.0/node_modules/vscode-ripgrep
Output:
Finding release for v13.0.0-2
GET https://api.github.com/repos/microsoft/ripgrep-prebuilt/releases/tags/v13.0.0-2
Deleting invalid download cache
Downloading ripgrep failed: Error: Asset not found with name: ripgrep-v13.0.0-2-powerpc64le-unknown-linux-gnu.tar.gz
    at getAssetFromGithubApi (/builddir/vscode-1.61.0/node_modules/vscode-ripgrep/lib/download.js:204:15)
    at processTicksAndRejections (node:internal/process/task_queues:96:5)
    at async module.exports (/builddir/vscode-1.61.0/node_modules/vscode-ripgrep/lib/download.js:298:9)
    at async main (/builddir/vscode-1.61.0/node_modules/vscode-ripgrep/lib/postinstall.js:83:9)
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: vscode: update to 1.61.0
  2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
                   ` (13 preceding siblings ...)
  2021-10-12 14:17 ` q66
@ 2021-10-12 19:37 ` atk
  14 siblings, 0 replies; 16+ messages in thread
From: atk @ 2021-10-12 19:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/33421#issuecomment-941363476

Comment:
Sorry, I cannot test it on ppc64, because I have no machine with that architecture. Therefore, any attempt to fix this from my side would be based on speculation and thus very probably futile and wasted time.

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-10-12 19:37 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-08  7:56 [PR PATCH] vscode: update to 1.61.0 atk
2021-10-08  8:01 ` [PR REVIEW] " paper42
2021-10-08  8:02 ` paper42
2021-10-08  8:20 ` atk
2021-10-08  8:22 ` [PR PATCH] [Updated] " atk
2021-10-08  8:22 ` [PR REVIEW] " atk
2021-10-08 15:45 ` paper42
2021-10-08 18:40 ` [PR PATCH] [Updated] " atk
2021-10-08 18:42 ` [PR REVIEW] " atk
2021-10-08 19:45 ` paper42
2021-10-10 18:51 ` atk
2021-10-10 19:14 ` [PR PATCH] [Updated] " atk
2021-10-11 20:03 ` atk
2021-10-12  6:11 ` [PR PATCH] [Merged]: " paper42
2021-10-12 14:17 ` q66
2021-10-12 19:37 ` atk

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git