vscode: update to 1.49.1 + switch to electron9. [ci skip]

This commit is contained in:
Toby Merz 2020-09-18 09:49:09 +02:00 committed by John Zimmermann
parent c592828b2d
commit ae6f1afb82
1 changed files with 9 additions and 10 deletions

View File

@ -1,27 +1,26 @@
# Template file for 'vscode' # Template file for 'vscode'
pkgname=vscode pkgname=vscode
version=1.49.0 version=1.49.1
revision=1 revision=1
# XXX: please update to electron9 next time you rebuild this package _electronver=9.2.1
_electronver=7.3.3
hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git" hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
makedepends="libxkbfile-devel libsecret-devel electron7" makedepends="libxkbfile-devel libsecret-devel electron9"
depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron7" depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
short_desc="Microsoft Code for Linux" short_desc="Microsoft Code for Linux"
maintainer="shizonic <realtiaz@gmail.com>" maintainer="shizonic <realtiaz@gmail.com>"
license="MIT" license="MIT"
homepage="https://code.visualstudio.com/" homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
checksum=b296569db14fadce08a5743a0f6628637fffb817376eb76b5c5d67fb588de29e checksum=0fb3829c19db0bea17cf0fd83859ff8f9aef0d092cad4abe2a4d1b26c985b628
patch_args="-Np1" patch_args="-Np1"
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then 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 fi
+# avoid downloading electron binaries for target platform; we use # avoid downloading electron binaries for target platform; we use
+# the system electron, and downloading does not work for all archs # the system electron, and downloading does not work for all archs
+export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
do_configure() { do_configure() {
# Use yarn to install dependencies # Use yarn to install dependencies
@ -46,7 +45,7 @@ do_build() {
export NODE_OPTIONS="${_mem_limit}" export NODE_OPTIONS="${_mem_limit}"
/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \ /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
--target=$_electronver \ --target=$_electronver \
--tarball=/usr/include/electron7/node_headers.tar.gz --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
yarn install --ignore-engines --frozen-lockfile --arch=x64 yarn install --ignore-engines --frozen-lockfile --arch=x64
export CFLAGS="$CFLAGS -I/usr/include/node" export CFLAGS="$CFLAGS -I/usr/include/node"
yarn run gulp vscode-linux-x64-min yarn run gulp vscode-linux-x64-min