[-- 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' \
[-- Attachment #1: Type: text/plain, Size: 168 bytes --] New comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1037470350 Comment: 1.64.2 is available.
[-- Attachment #1: Type: text/plain, Size: 211 bytes --] New comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1037470350 Comment: 1.64.2 is available. We will probably wait until it stabilized.
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --] There is an updated 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 66733a3715c1e8321a111d04e530e94f357cad57 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.2 --- .../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..010700f64197 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.2 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=57abc9c4ff40c93353eeb14cf05ca6863522b62f173fd7ed20994c86b1754689 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' \
[-- Attachment #1: Type: text/plain, Size: 198 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1038789090 Comment: I updated to 1.64.2 and took the time to test it a bit more.
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.2 <!-- 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 --> 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 9b845e68d44825576c6ab51e9d2d77e374754c4a 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.2 --- .../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..010700f64197 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.2 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=57abc9c4ff40c93353eeb14cf05ca6863522b62f173fd7ed20994c86b1754689 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' \
[-- Attachment #1: Type: text/plain, Size: 238 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r810612711 Comment: This patch was just rebased, could you remove the changes if the old version still applies?
[-- Attachment #1: Type: text/plain, Size: 181 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1046218952 Comment: @q66 would you mind looking at this PR?
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.2 <!-- 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 --> 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: 5498 bytes --] From dd64f57689296cef0225011f6530af411bf52fdb Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.64.2 --- srcpkgs/vscode/patches/product.patch | 9 +++--- srcpkgs/vscode/patches/ripgrep.patch | 42 ++++++++++++++-------------- srcpkgs/vscode/template | 7 ++--- 3 files changed, 28 insertions(+), 30 deletions(-) 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..010700f64197 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.2 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=57abc9c4ff40c93353eeb14cf05ca6863522b62f173fd7ed20994c86b1754689 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' \
[-- Attachment #1: Type: text/plain, Size: 148 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r811676607 Comment: done.
[-- Attachment #1: Type: text/plain, Size: 223 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1047656849 Comment: I just had an idea on how to remove the ripgrep dependency altogether. Let me try it.
[-- Attachment #1: Type: text/plain, Size: 223 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1047656849 Comment: I just had an idea on how to remove the ripgrep dependency altogether. Let me try it.
[-- Attachment #1: Type: text/plain, Size: 241 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1053676072 Comment: I'm using it for a week now and haven't found any issues. Is there any reason this shouldn't be merged?
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.2 <!-- 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 --> 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: 5498 bytes --] From da0d5797ce9a32282cb7f44ade8e40e0e338489d Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.64.2 --- srcpkgs/vscode/patches/product.patch | 9 +++--- srcpkgs/vscode/patches/ripgrep.patch | 42 ++++++++++++++-------------- srcpkgs/vscode/template | 7 ++--- 3 files changed, 28 insertions(+), 30 deletions(-) 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..010700f64197 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.2 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=57abc9c4ff40c93353eeb14cf05ca6863522b62f173fd7ed20994c86b1754689 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' \
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.2 <!-- 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 --> 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: 6753 bytes --] From 3bfdce86d6d80459306c112149fdcf219d6f945f Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.65.0 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 11 +++-- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 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 9d630f23cd7..eea95dce319 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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/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..c4833ad478dd 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.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" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst libxkbfile ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" 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=b7dc15761935d4b004fd6dd86d8d6729ac5e3960c9b72791de8b56e397929d22 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' \
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.65.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 --> 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: 6753 bytes --] From c3e6b33cfec858cf8000492e786af48326bdf267 Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.65.1 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 11 +++-- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 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 9d630f23cd7..eea95dce319 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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/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..8c8138fefb2e 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.1 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" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst libxkbfile ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" 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=569412b16cb2cd9b6bc520f1892f9e098fffc8cb225117945810f987a3115a86 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' \
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.65.1 <!-- 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 --> 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: 6753 bytes --] From 4cbb383d42840329c666353a5b7b84c57792ba06 Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.65.2 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 11 +++-- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 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 9d630f23cd7..eea95dce319 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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/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..56c66de902ff 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.2 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" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst libxkbfile ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" 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=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e 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' \
[-- Attachment #1: Type: text/plain, Size: 373 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#issuecomment-1064895559 Comment: We're now 2 minor versions behind. This release also closes a medium-level security vulnerability that we shouldn't let our users be exposed to longer than necessary: https://msrc.microsoft.com/update-guide/vulnerability/CVE-2022-24526
[-- Attachment #1: Type: text/plain, Size: 293 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825507722 Comment: ```suggestion depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" ``` It should be auto-detected as a shlib dependency.
[-- Attachment #1: Type: text/plain, Size: 263 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825507870 Comment: Would you like to adopt this package? You did most of the updates recently. @shizonic does this sound ok for you?
[-- Attachment #1: Type: text/plain, Size: 171 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825510069 Comment: Can we use python3 here?
[-- Attachment #1: Type: text/plain, Size: 266 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825632178 Comment: I'm fine with that. I learned from @shizonic how to handle it and since it's my daily driver, I'll keep it updated anyways.
[-- Attachment #1: Type: text/plain, Size: 155 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825700637 Comment: I'll try it.
[-- Attachment #1: Type: text/plain, Size: 156 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825711221 Comment: Works for me.
[-- Attachment #1: Type: text/plain, Size: 198 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825712168 Comment: We could also be co-maintainers if you want, @shizonic.
[-- Attachment #1: Type: text/plain, Size: 184 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825712273 Comment: works for me, so I'll include the update.
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.65.1 <!-- 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 --> 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: 6809 bytes --] From 8560e66d7d24a1b2e412dd9a68bc13646ce6b0b8 Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.65.2 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 13 +++--- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 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 9d630f23cd7..eea95dce319 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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/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..5f8934122189 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.2 revision=1 -_electronver=13.6.1 -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" +_electronver=13.6.7 +hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" 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=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e 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' \
[-- Attachment #1: Type: text/plain, Size: 312 bytes --] New review comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/35465#discussion_r825712168 Comment: We could also be co-maintainers if you want, @shizonic. I've updated the maintainer field accurdingly. If you don't want to maintain it anymore, you can remove yourself.
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There is an updated 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.65.1 <!-- 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 --> 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: 6889 bytes --] From b67e281c0514fbea3fb2974ee0631d962fc77ede Mon Sep 17 00:00:00 2001 From: Alex Lohr <alex.lohr@logmein.com> Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH] vscode: update to 1.65.2 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 15 ++++--- 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 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 9d630f23cd7..eea95dce319 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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/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..620c9a6928aa 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.2 revision=1 -_electronver=13.6.1 -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" +_electronver=13.6.7 +hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" -maintainer="shizonic <realtiaz@gmail.com>" +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=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624 +checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e 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' \
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --] There's a merged pull request on the void-packages repository vscode: update to 1.65.1 https://github.com/void-linux/void-packages/pull/35465 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 --> 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.