Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.66.0.
@ 2022-04-01  9:00 shizonic
  2022-04-01 10:04 ` [PR PATCH] [Updated] " shizonic
                   ` (18 more replies)
  0 siblings, 19 replies; 20+ messages in thread
From: shizonic @ 2022-04-01  9:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/shizonic/void-packages vscode
https://github.com/void-linux/void-packages/pull/36450

vscode: update to 1.66.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/36450.patch is attached

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

From 3f2991e509b4a838f6d4a9f09956193749a54b0a Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH] vscode: update to 1.66.0.

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

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"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/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..96b0dea9fb1f 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,31 +1,25 @@
-Ping atk 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 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..6c7ab10c522c 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

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

* Re: [PR PATCH] [Updated] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
@ 2022-04-01 10:04 ` shizonic
  2022-04-02  5:05 ` [PR REVIEW] " subnut
                   ` (17 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-01 10:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/shizonic/void-packages vscode
https://github.com/void-linux/void-packages/pull/36450

vscode: update to 1.66.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/36450.patch is attached

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

From 50e4a066db6e6c085ddb7cf94c302d1a676f07fe Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH] vscode: update to 1.66.0.

---
 srcpkgs/vscode/patches/product.patch | 12 +++---------
 srcpkgs/vscode/patches/ripgrep.patch | 20 +++++++-------------
 srcpkgs/vscode/template              |  9 ++++++---
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"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/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..96b0dea9fb1f 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,31 +1,25 @@
-Ping atk 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 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..08eef54b7c11 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +46,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@latest && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
  2022-04-01 10:04 ` [PR PATCH] [Updated] " shizonic
@ 2022-04-02  5:05 ` subnut
  2022-04-02  8:02 ` paper42
                   ` (16 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: subnut @ 2022-04-02  5:05 UTC (permalink / raw)
  To: ml

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841009272

Comment:
Why remove these comments?

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
  2022-04-01 10:04 ` [PR PATCH] [Updated] " shizonic
  2022-04-02  5:05 ` [PR REVIEW] " subnut
@ 2022-04-02  8:02 ` paper42
  2022-04-02  8:05 ` [PR REVIEW] " atk
                   ` (15 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-02  8:02 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1086582300

Comment:
@atk 

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (2 preceding siblings ...)
  2022-04-02  8:02 ` paper42
@ 2022-04-02  8:05 ` atk
  2022-04-02  8:21 ` shizonic
                   ` (14 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: atk @ 2022-04-02  8:05 UTC (permalink / raw)
  To: ml

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

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841038812

Comment:
Because he removed the actual solution so that vscode uses its own version of ripgrep again. Not sure if I concur; we usually prefer to use our own version.

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (3 preceding siblings ...)
  2022-04-02  8:05 ` [PR REVIEW] " atk
@ 2022-04-02  8:21 ` shizonic
  2022-04-02 11:38 ` atk
                   ` (13 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-02  8:21 UTC (permalink / raw)
  To: ml

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

New review comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841040986

Comment:
Sorry removed it by mistake.. Gonna readd it again.

@atk I still use your version.

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (4 preceding siblings ...)
  2022-04-02  8:21 ` shizonic
@ 2022-04-02 11:38 ` atk
  2022-04-02 21:27 ` paper42
                   ` (12 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: atk @ 2022-04-02 11:38 UTC (permalink / raw)
  To: ml

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

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841066218

Comment:
Thanks, if it's up to me, I approve.

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (5 preceding siblings ...)
  2022-04-02 11:38 ` atk
@ 2022-04-02 21:27 ` paper42
  2022-04-02 21:34 ` Anachron
                   ` (11 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-02 21:27 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841121284

Comment:
```suggestion
	npm install -g npm@latest
	yarn install --ignore-engines --arch=x64
```
Why do we need to update npm?

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (6 preceding siblings ...)
  2022-04-02 21:27 ` paper42
@ 2022-04-02 21:34 ` Anachron
  2022-04-02 22:05 ` [PR REVIEW] " shizonic
                   ` (10 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: Anachron @ 2022-04-02 21:34 UTC (permalink / raw)
  To: ml

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

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1086728235

Comment:
Also latest is non-reproducable, is it?

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (7 preceding siblings ...)
  2022-04-02 21:34 ` Anachron
@ 2022-04-02 22:05 ` shizonic
  2022-04-02 22:06 ` shizonic
                   ` (9 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-02 22:05 UTC (permalink / raw)
  To: ml

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

New review comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841124307

Comment:
Otherwise built failed ... Guess because node-gyp uses it own outdated version of npm.

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (8 preceding siblings ...)
  2022-04-02 22:05 ` [PR REVIEW] " shizonic
@ 2022-04-02 22:06 ` shizonic
  2022-04-02 22:11 ` [PR REVIEW] " shizonic
                   ` (8 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-02 22:06 UTC (permalink / raw)
  To: ml

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

New comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1086732298

Comment:
> Also latest is non-reproducable, is it?

No, you are right. I could pin it to version 8.6.0 if desired.

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

* Re: [PR REVIEW] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (9 preceding siblings ...)
  2022-04-02 22:06 ` shizonic
@ 2022-04-02 22:11 ` shizonic
  2022-04-04  8:01 ` [PR PATCH] [Updated] " shizonic
                   ` (7 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-02 22:11 UTC (permalink / raw)
  To: ml

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

New review comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#discussion_r841124307

Comment:
Otherwise built failed ... Guess because some yarn packages use it own outdated versions of npm. If I update it before they use the current globally installed (in case of latest this is currently 8.6.0) and it builds successfully.

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

* Re: [PR PATCH] [Updated] vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (10 preceding siblings ...)
  2022-04-02 22:11 ` [PR REVIEW] " shizonic
@ 2022-04-04  8:01 ` shizonic
  2022-04-04  8:02 ` shizonic
                   ` (6 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-04  8:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/shizonic/void-packages vscode
https://github.com/void-linux/void-packages/pull/36450

vscode: update to 1.66.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/36450.patch is attached

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

From 97575dd00dc3b2c2cad6abf1e40b22f946f68fc7 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH] vscode: update to 1.66.0.

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

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"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/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..3fdc568a9e54 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..0b9efda224d0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
+_npmver=8.6.0
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
 depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +47,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@${_npmver} && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (11 preceding siblings ...)
  2022-04-04  8:01 ` [PR PATCH] [Updated] " shizonic
@ 2022-04-04  8:02 ` shizonic
  2022-04-10  9:05 ` paper42
                   ` (5 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: shizonic @ 2022-04-04  8:02 UTC (permalink / raw)
  To: ml

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

New comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1087237464

Comment:
Made the desired changes.

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (12 preceding siblings ...)
  2022-04-04  8:02 ` shizonic
@ 2022-04-10  9:05 ` paper42
  2022-04-10  9:05 ` [PR PATCH] [Merged]: " paper42
                   ` (4 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-10  9:05 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1094224345

Comment:
I still don't like it, but I guess there is no good way around it.

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

* Re: [PR PATCH] [Merged]: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (13 preceding siblings ...)
  2022-04-10  9:05 ` paper42
@ 2022-04-10  9:05 ` paper42
  2022-04-10 10:01 ` atk
                   ` (3 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-10  9:05 UTC (permalink / raw)
  To: ml

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

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

vscode: update to 1.66.0.
https://github.com/void-linux/void-packages/pull/36450

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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] 20+ messages in thread

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (14 preceding siblings ...)
  2022-04-10  9:05 ` [PR PATCH] [Merged]: " paper42
@ 2022-04-10 10:01 ` atk
  2022-04-10 12:24 ` paper42
                   ` (2 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: atk @ 2022-04-10 10:01 UTC (permalink / raw)
  To: ml

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

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1094235268

Comment:
At least not if we don't want to provide different node/npm versions in our packages.

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (15 preceding siblings ...)
  2022-04-10 10:01 ` atk
@ 2022-04-10 12:24 ` paper42
  2022-04-10 15:06 ` atk
  2022-04-10 20:51 ` paper42
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-10 12:24 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1094261707

Comment:
> At least not if we don't want to provide different node/npm versions in our packages.

I would actually be in favor of having multiple nodejs packages (all supported LTS versions + current) if it was done elegantly and they were not conflicting.

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (16 preceding siblings ...)
  2022-04-10 12:24 ` paper42
@ 2022-04-10 15:06 ` atk
  2022-04-10 20:51 ` paper42
  18 siblings, 0 replies; 20+ messages in thread
From: atk @ 2022-04-10 15:06 UTC (permalink / raw)
  To: ml

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

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1094293472

Comment:
What are your criteria for elegance?

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

* Re: vscode: update to 1.66.0.
  2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
                   ` (17 preceding siblings ...)
  2022-04-10 15:06 ` atk
@ 2022-04-10 20:51 ` paper42
  18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-04-10 20:51 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36450#issuecomment-1094366635

Comment:
> What are your criteria for elegance?

That's hard to say. It should be transparent to users - they shouldn't have to know internals of our packaging to be able to use nodejs. I think we can discuss this further in a [RFC] issue where other maintainers will also see this.

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

end of thread, other threads:[~2022-04-10 20:51 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01  9:00 [PR PATCH] vscode: update to 1.66.0 shizonic
2022-04-01 10:04 ` [PR PATCH] [Updated] " shizonic
2022-04-02  5:05 ` [PR REVIEW] " subnut
2022-04-02  8:02 ` paper42
2022-04-02  8:05 ` [PR REVIEW] " atk
2022-04-02  8:21 ` shizonic
2022-04-02 11:38 ` atk
2022-04-02 21:27 ` paper42
2022-04-02 21:34 ` Anachron
2022-04-02 22:05 ` [PR REVIEW] " shizonic
2022-04-02 22:06 ` shizonic
2022-04-02 22:11 ` [PR REVIEW] " shizonic
2022-04-04  8:01 ` [PR PATCH] [Updated] " shizonic
2022-04-04  8:02 ` shizonic
2022-04-10  9:05 ` paper42
2022-04-10  9:05 ` [PR PATCH] [Merged]: " paper42
2022-04-10 10:01 ` atk
2022-04-10 12:24 ` paper42
2022-04-10 15:06 ` atk
2022-04-10 20:51 ` paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).