Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.64.0
@ 2022-02-07 21:44 atk
  2022-02-12 20:51 ` tibequadorian
                   ` (28 more replies)
  0 siblings, 29 replies; 30+ messages in thread
From: atk @ 2022-02-07 21:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atk/void-packages vscode-1.64.0
https://github.com/void-linux/void-packages/pull/35465

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

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### 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
-->

I changed q66's package to replace @vscode/ripgrep to a far simpler version that only exposes the correct path and thus should never need to change and also removes the requirement to copy over files.

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

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

From a32a16e87d1a3f8e0e617efa5ff3e7e547fc33a7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 7 Feb 2022 22:13:14 +0100
Subject: [PATCH] vscode: update to 1.64.0

---
 .../patches/disable-crash-reporter.patch      |  6 +--
 srcpkgs/vscode/patches/product.patch          |  9 ++--
 srcpkgs/vscode/patches/ripgrep.patch          | 42 +++++++++----------
 srcpkgs/vscode/template                       |  7 ++--
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index d91f6895969c..4473083a5b15 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -14,7 +14,7 @@ So, disable it entirely. No cookies for you, Visual Studio Code team.
  3 files changed, 1 insertion(+), 20 deletions(-)
 
 diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
-index f7b07e49255..576c82f23e8 100644
+index c11168a2bc7..5978959dc2a 100644
 --- a/src/bootstrap-fork.js
 +++ b/src/bootstrap-fork.js
 @@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) {
@@ -28,10 +28,10 @@ index f7b07e49255..576c82f23e8 100644
  require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
  
 diff --git a/src/main.js b/src/main.js
-index ad838aa245e..e6319e100b9 100644
+index 0c2981ec2d0..18a19b8aabd 100644
 --- a/src/main.js
 +++ b/src/main.js
-@@ -46,22 +46,6 @@ const codeCachePath = getCodeCachePath();
+@@ -44,22 +44,6 @@ const codeCachePath = getCodeCachePath();
  // Configure static command line arguments
  const argvConfig = configureCommandlineSwitchesSync(args);
  
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index edeebf5d1439..14fad7457995 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,19 +1,18 @@
 diff --git a/product.json b/product.json
-index 22e93d4b7c3..335cddd4c7c 100644
+index 15aa2da235e..3b520fd4ecd 100644
 --- a/product.json
 +++ b/product.json
-@@ -25,13 +25,22 @@
+@@ -27,6 +27,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/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/d372f9187401bd145a0a6e15ba369e2d82d02005/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
- 		"ms-vscode.vscode-js-profile-table",
-+		"ms-python.python",
+@@ -34,6 +37,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 6e81145a1cb1..ff0dfc233e41 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,32 +1,32 @@
-Ping q66 if this needs updating.
+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 6d1fb7cca0c..057ed39ac31 100644
+index 5d6022a2a40..f66ee44eef0 100644
 --- a/package.json
 +++ b/package.json
-@@ -83,7 +83,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.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -63,7 +63,7 @@
+     "@parcel/watcher": "2.0.5",
+     "@vscode/debugprotocol": "1.51.0",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sudo-prompt": "9.3.1",
+     "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 662ce3568ab..a79fe3764d9 100644
+index 4bc40998093..9d22d408c02 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -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.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -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": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/vscode-languagedetection": "1.0.21",
+     "applicationinsights": "1.4.2",
+     "cookie": "^0.4.0",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 97f1a142a814..f9a680827158 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,8 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.63.2
+version=1.64.0
 revision=1
-_electronver=13.6.1
+_electronver=13.6.7
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel electron13"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -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=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624
+checksum=b068d1d5353f36dd367b01dd69a6fbbe55f425608b06309549c2b4be35dd97b4
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -61,7 +61,6 @@ do_install() {
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
 	vmkdir usr/share/pixmaps
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	vsed \
 	-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
 	-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \

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

end of thread, other threads:[~2022-03-16  9:28 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-07 21:44 [PR PATCH] vscode: update to 1.64.0 atk
2022-02-12 20:51 ` tibequadorian
2022-02-12 20:53 ` tibequadorian
2022-02-14  8:22 ` [PR PATCH] [Updated] " atk
2022-02-14  8:23 ` atk
2022-02-14  8:26 ` [PR PATCH] [Updated] vscode: update to 1.64.2 atk
2022-02-20 11:44 ` [PR REVIEW] " paper42
2022-02-20 11:45 ` paper42
2022-02-22  8:15 ` [PR PATCH] [Updated] " atk
2022-02-22  8:15 ` [PR REVIEW] " atk
2022-02-22 10:37 ` atk
2022-02-22 10:45 ` atk
2022-02-27 20:47 ` atk
2022-02-27 20:49 ` [PR PATCH] [Updated] " atk
2022-03-07 12:48 ` atk
2022-03-08 20:45 ` [PR PATCH] [Updated] vscode: update to 1.65.0 atk
2022-03-11  8:37 ` [PR PATCH] [Updated] vscode: update to 1.65.1 atk
2022-03-11  8:41 ` atk
2022-03-13 21:59 ` [PR REVIEW] " paper42
2022-03-13 21:59 ` paper42
2022-03-13 22:02 ` paper42
2022-03-14  6:46 ` atk
2022-03-14  8:39 ` atk
2022-03-14  8:52 ` atk
2022-03-14  8:53 ` atk
2022-03-14  8:53 ` atk
2022-03-14  8:56 ` [PR PATCH] [Updated] " atk
2022-03-14  8:58 ` [PR REVIEW] " atk
2022-03-14  9:04 ` [PR PATCH] [Updated] " atk
2022-03-16  9:28 ` [PR PATCH] [Merged]: " 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).