From 20d1d1a4a0a16597d2906c0e7cda0da0200e2251 Mon Sep 17 00:00:00 2001 From: Alex Lohr 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 827b902978795d..2725320b4adbf3 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 a00a0e348168d9..389dd6a5aa1399 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 35151cf029b78e..bbf881b4ba6b72 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 " 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