From e91a0c67d450d7d5f8d41d87c543a93eaef79bb6 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 19 Dec 2023 13:46:15 +0100 Subject: [PATCH] vscode: update to 1.85.1 --- srcpkgs/vscode/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index d588f6e4aee85..97ac453dd87f8 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.85.0 +version=1.85.1 revision=1 _electronver=24.3.0 _npmver=8.6.0 @@ -12,13 +12,9 @@ maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=b7fcf4fce5ce31669e93240783ff9ecfbe6d239bb2446c5eb3c11900d430a727 +checksum=b16d2058a8961bb2753f6ff0d697694a670ff6f926b4b6ac63106c6eab168eca nocross=yes # x64 build does not cut it, it contains native code -# Build fails on `yarn run gulp vscode-linux-x64-min` -# See, e.g., https://build.voidlinux.org/builders/x86_64-musl_builder/builds/50400/steps/shell_3/logs/stdio -broken="EMFILE: too many open files" - if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory" fi @@ -61,6 +57,7 @@ do_build() { _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 @@ -71,8 +68,10 @@ do_build() { yarn install --frozen-lockfile --arch=x64 - # do not checksum electron, since we're using our own build - vsed -e "s/validateChecksum: true/validateChecksum: false/g" -i build/lib/electron.*s + # patch node fs with graceful-fs to avoid using too many file descriptors + yarn add --dev graceful-fs@4.2.11 + echo "require('graceful-fs').gracefulify(require('fs'));" > ${wrksrc}/use-graceful-fs.js + export NODE_OPTIONS="${_mem_limit} --require ${wrksrc}/use-graceful-fs.js" export CFLAGS="$CFLAGS -I/usr/include/node" yarn run gulp vscode-linux-x64-min