[PR PATCH] vscode: update to 1.62.0

[PR PATCH] vscode: update to 1.62.0

[atk]

[-- 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.62.0
https://github.com/void-linux/void-packages/pull/33962

vscode: update to 1.62.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/33962.patch is attached

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

From a98c4f8baf6851e7bdc94885f8552af5b08d265e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Nov 2021 14:38:20 +0100
Subject: [PATCH] vscode: update to 1.62.0

---
 srcpkgs/vscode/patches/product.patch |  8 ++++----
 srcpkgs/vscode/patches/ripgrep.patch | 22 +++++++++-------------
 srcpkgs/vscode/template              |  4 ++--
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 827b90297879..2725320b4adb 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,18 +1,18 @@
 diff --git a/product.json b/product.json
-index 7b60eac641d..c9aeeeecfe6 100644
+index 14ef10628d3..a5b1df55002 100644
 --- a/product.json
 +++ b/product.json
-@@ -22,6 +22,9 @@
+@@ -23,6 +23,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
-@@ -31,6 +34,11 @@
+@@ -32,6 +35,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index a00a0e348168..c0e2f2d7ebc2 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,30 +1,26 @@
-Ping q66 if this needs updating.
-
-This prevents vscode from fetching prebuilt ripgrep from Microsoft
-during build, which unbreaks build on platforms where MS deos not
-ship a prebuilt ripgrep.
-
+diff --git a/package.json b/package.json
+index 63b479ec19a..99d00f9e453 100644
 --- a/package.json
 +++ b/package.json
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
 diff --git a/remote/package.json b/remote/package.json
-index b0bff62..88a036e 100644
+index 0cf9004f479..d621534fbc2 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 35151cf029b7..bbf881b4ba6b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.61.2
+version=1.62.0
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -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=8854cb40d508ad30f3c83a5f6d9ef3072b82593a28c28ad7e7f62937217003ed
+checksum=e7e961d8115c94d37a2e360f92a3f4778a43eaddbf6fe183028e0c1759ccc803
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

Re: [PR REVIEW] vscode: update to 1.62.0

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33962#discussion_r744975545

Comment:
Please restore comment.

Re: [PR PATCH] [Updated] vscode: update to 1.62.0

[atk]

[-- 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.62.0
https://github.com/void-linux/void-packages/pull/33962

vscode: update to 1.62.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/33962.patch is attached

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

From 20d1d1a4a0a16597d2906c0e7cda0da0200e2251 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Nov 2021 21:11:12 +0100
Subject: [PATCH] vscode: update to 1.62.0

---
 srcpkgs/vscode/patches/product.patch |  8 ++++----
 srcpkgs/vscode/patches/ripgrep.patch | 14 ++++++--------
 srcpkgs/vscode/template              |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 827b90297879..2725320b4adb 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,18 +1,18 @@
 diff --git a/product.json b/product.json
-index 7b60eac641d..c9aeeeecfe6 100644
+index 14ef10628d3..a5b1df55002 100644
 --- a/product.json
 +++ b/product.json
-@@ -22,6 +22,9 @@
+@@ -23,6 +23,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
-@@ -31,6 +34,11 @@
+@@ -32,6 +35,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index a00a0e348168..389dd6a5aa13 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -6,25 +6,23 @@ ship a prebuilt ripgrep.
 
 --- a/package.json
 +++ b/package.json
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
-diff --git a/remote/package.json b/remote/package.json
-index b0bff62..88a036e 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 35151cf029b7..bbf881b4ba6b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.61.2
+version=1.62.0
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -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=8854cb40d508ad30f3c83a5f6d9ef3072b82593a28c28ad7e7f62937217003ed
+checksum=e7e961d8115c94d37a2e360f92a3f4778a43eaddbf6fe183028e0c1759ccc803
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

Re: [PR PATCH] [Merged]: vscode: update to 1.62.0

[ericonr]

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

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

vscode: update to 1.62.0
https://github.com/void-linux/void-packages/pull/33962

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
-->