From afd9131c6e0f0fbbc6170bf915e204ba4d2ab99b Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 14 Sep 2021 21:10:43 +0200 Subject: [PATCH] vscode: update to 1.60.1 --- srcpkgs/vscode/template | 78 ++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index b747ed43effc..e6b44ac269d5 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 " 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 + # 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 + # 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 + # 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" + # 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 + 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/ }