From: atk <atk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] vscode: update to 1.60.1
Date: Tue, 14 Sep 2021 21:11:34 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32965@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages vscode-1.60.1
https://github.com/void-linux/void-packages/pull/32965
vscode: update to 1.60.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.60.1-32965.patch --]
[-- Type: text/x-diff, Size: 5439 bytes --]
From db29fc2ea5eff07466738686598a868cfa3a9d5a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Sep 2021 21:10:43 +0200
Subject: [PATCH] vscode: update to 1.60.1
---
srcpkgs/vscode/template | 84 ++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b747ed43effc..f0b95bdd69e9 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.60.0
+version=1.60.1
revision=1
_electronver=13.2.2
hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,10 +11,10 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=3f0cde58ab558cd227c61900222f4363589a81e4df2fac2bb2042229c90a7ee8
+checksum=c3c7f10c19b76465a63c6179762187e53ddf1f3cee85f82b2ec447c9b6e9407a
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
+ broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
fi
# avoid downloading electron binaries for target platform; we use
@@ -22,49 +22,49 @@ fi
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
do_configure() {
- # Use yarn to install dependencies
- echo "" > build/npm/preinstall.js
-
- # redirect telemetry urls to 0.0.0.0
- # src: vscodium/undo_telemetry.sh
- _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
- _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
- grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
-
- # set used electron version
- sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
+ # Use yarn to install dependencies
+ echo "" > build/npm/preinstall.js
+
+ # redirect telemetry urls to 0.0.0.0
+ # src: vscodium/undo_telemetry.sh
+ _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
+ _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
+ grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
+
+ # set used electron version
+ sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
}
do_build() {
- # The default memory limit may be too low for current versions of node
- # to successfully build vscode. This sets it to 4GB, but
- # change this number if it still doesn't work for your system.
- _mem_limit="--max_old_space_size=4095"
-
- export NODE_OPTIONS="${_mem_limit}"
- /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
- --target=$_electronver \
- --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
- yarn install --ignore-engines --frozen-lockfile --arch=x64
- export CFLAGS="$CFLAGS -I/usr/include/node"
- yarn run gulp vscode-linux-x64-min
+ # The default memory limit may be too low for current versions of node
+ # to successfully build vscode. This sets it to 4GB, but
+ # change this number if it still doesn't work for your system.
+ _mem_limit="--max_old_space_size=4095"
+
+ export NODE_OPTIONS="${_mem_limit}"
+ /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
+ --target=$_electronver \
+ --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
+ yarn install --ignore-engines --frozen-lockfile --arch=x64
+ export CFLAGS="$CFLAGS -I/usr/include/node"
+ yarn run gulp vscode-linux-x64-min
}
do_install() {
- vmkdir usr/lib/code-oss
- vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
- vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
- vmkdir usr/bin
- ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
- vmkdir usr/share/applications
- 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' \
- -i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
- vlicense LICENSE.txt
- chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
+ vmkdir usr/lib/code-oss
+ vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
+ vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
+ vmkdir usr/bin
+ ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
+ vmkdir usr/share/applications
+ 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' \
+ -i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
+ vlicense LICENSE.txt
+ chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
}
next reply other threads:[~2021-09-14 19:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 19:11 atk [this message]
2021-09-14 19:15 ` [PR PATCH] [Updated] " atk
2021-09-14 19:18 ` atk
2021-09-14 19:20 ` [PR REVIEW] " ericonr
2021-09-14 19:21 ` ericonr
2021-09-14 19:23 ` paper42
2021-09-14 19:23 ` [PR PATCH] [Updated] " atk
2021-09-14 19:25 ` [PR REVIEW] " atk
2021-09-14 19:33 ` atk
2021-09-19 8:07 ` paper42
2021-09-19 8:08 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32965@inbox.vuxu.org \
--to=atk@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).