From: shizonic <shizonic@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] vscode: update to 1.66.0.
Date: Fri, 01 Apr 2022 12:04:16 +0200 [thread overview]
Message-ID: <20220401100416.z1L94S2tvUYGETMoWoXmtaZYmKTAo-RjDwSpm378PoM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36450@inbox.vuxu.org>
[-- 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
}
next prev parent reply other threads:[~2022-04-01 10:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-01 9:00 [PR PATCH] " shizonic
2022-04-01 10:04 ` shizonic [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220401100416.z1L94S2tvUYGETMoWoXmtaZYmKTAo-RjDwSpm378PoM@z \
--to=shizonic@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).