From 9c667389989231bc3bf9002e5b8526c26ce4202b Mon Sep 17 00:00:00 2001 From: Toby Merz 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 " 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