Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.63.0
@ 2021-12-09  8:52 atk
  2021-12-09 10:02 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 3+ messages in thread
From: atk @ 2021-12-09  8:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atk/void-packages vscode-1.63.0
https://github.com/void-linux/void-packages/pull/34438

vscode: update to 1.63.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 [skip CI](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/34438.patch is attached

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

From 8cdee63e4912ef44dca0a40c9cdd858a00ca32be Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 9 Dec 2021 09:52:28 +0100
Subject: [PATCH] vscode: update to 1.63.0

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

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index e1874ba18545..edeebf5d1439 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,20 +1,18 @@
 diff --git a/product.json b/product.json
-index 14ef10628d3..a5b1df55002 100644
+index 22e93d4b7c3..335cddd4c7c 100644
 --- a/product.json
 +++ b/product.json
-@@ -23,15 +23,24 @@
+@@ -25,13 +25,22 @@
  	"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/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
  		"ms-vscode.vscode-js-profile-table",
- 		"ms-vscode.remotehub",
- 		"ms-vscode.remotehub-insiders",
 +		"ms-python.python",
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 389dd6a5aa13..6e81145a1cb1 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -4,25 +4,29 @@ 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 6d1fb7cca0c..057ed39ac31 100644
 --- a/package.json
 +++ b/package.json
 @@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.5.1",
+     "vscode-oniguruma": "1.6.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.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
+diff --git a/remote/package.json b/remote/package.json
+index 662ce3568ab..a79fe3764d9 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -23,7 +23,7 @@
-     "vscode-oniguruma": "1.5.1",
+@@ -22,7 +22,7 @@
+     "vscode-oniguruma": "1.6.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.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 1933b2194164..20b84996bf27 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.3
+version=1.63.0
 revision=1
 _electronver=13.6.1
 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=87638a1b26f58225d3cae953f5a5036139ef3529a43caee50c4c18def801ce22
+checksum=e71637baa6e3ccba876e6d465bda517f40aef2548f8941f69f38891bd0f983f3
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

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

* Re: [PR PATCH] [Merged]: vscode: update to 1.63.0
  2021-12-09  8:52 [PR PATCH] vscode: update to 1.63.0 atk
@ 2021-12-09 10:02 ` Johnnynator
  0 siblings, 0 replies; 3+ messages in thread
From: Johnnynator @ 2021-12-09 10:02 UTC (permalink / raw)
  To: ml

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

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

vscode: update to 1.63.0
https://github.com/void-linux/void-packages/pull/34438

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 [skip CI](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] 3+ messages in thread

* [PR PATCH] vscode: update to 1.63.0.
@ 2021-12-09  9:38 shizonic
  0 siblings, 0 replies; 3+ messages in thread
From: shizonic @ 2021-12-09  9:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 381 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/34440

vscode: update to 1.63.0.
#### Testing the changes
- I tested the changes in this PR: **YES**


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

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

From 9c667389989231bc3bf9002e5b8526c26ce4202b Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Thu, 9 Dec 2021 10:37:42 +0100
Subject: [PATCH] vscode: update to 1.63.0.

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

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index e1874ba18545..5e4608d461e9 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,20 +1,18 @@
 diff --git a/product.json b/product.json
-index 14ef10628d3..a5b1df55002 100644
+index 22e93d4b7c33..335cddd4c7ce 100644
 --- a/product.json
 +++ b/product.json
-@@ -23,15 +23,24 @@
+@@ -25,13 +25,22 @@
  	"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/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
  		"ms-vscode.vscode-js-profile-table",
- 		"ms-vscode.remotehub",
- 		"ms-vscode.remotehub-insiders",
 +		"ms-python.python",
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 389dd6a5aa13..3d8d93d5dcf1 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,28 +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 6d1fb7cca0c8..057ed39ac31c 100644
 --- a/package.json
 +++ b/package.json
 @@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.5.1",
+     "vscode-oniguruma": "1.6.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.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
+diff --git a/remote/package.json b/remote/package.json
+index 662ce3568ab7..a79fe3764d95 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -23,7 +23,7 @@
-     "vscode-oniguruma": "1.5.1",
+@@ -22,7 +22,7 @@
+     "vscode-oniguruma": "1.6.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.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 1933b2194164..20b84996bf27 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.3
+version=1.63.0
 revision=1
 _electronver=13.6.1
 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=87638a1b26f58225d3cae953f5a5036139ef3529a43caee50c4c18def801ce22
+checksum=e71637baa6e3ccba876e6d465bda517f40aef2548f8941f69f38891bd0f983f3
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

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

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

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-09  8:52 [PR PATCH] vscode: update to 1.63.0 atk
2021-12-09 10:02 ` [PR PATCH] [Merged]: " Johnnynator
2021-12-09  9:38 [PR PATCH] " shizonic

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