From d5e7fdb4510bc2353bcccde2ca134b65c4b599cf Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 12 Oct 2021 19:37:49 +0200 Subject: [PATCH] vscode: do not download prebuilt ripgrep This unbreaks ppc64le at least. --- srcpkgs/vscode/patches/ripgrep.patch | 30 ++++++++++++++++++++++++++++ srcpkgs/vscode/template | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/vscode/patches/ripgrep.patch diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch new file mode 100644 index 00000000000..a00a0e34816 --- /dev/null +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -0,0 +1,30 @@ +Ping q66 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. + +--- a/package.json ++++ b/package.json +@@ -82,7 +82,7 @@ + "vscode-oniguruma": "1.5.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.4.0", + "xterm": "4.15.0-beta.3", + "xterm-addon-search": "0.9.0-beta.5", +diff --git a/remote/package.json b/remote/package.json +index b0bff62..88a036e 100644 +--- a/remote/package.json ++++ b/remote/package.json +@@ -22,7 +22,7 @@ + "vscode-oniguruma": "1.5.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.4.0", + "xterm": "4.15.0-beta.3", + "xterm-addon-search": "0.9.0-beta.5", diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 2c7ec495088..0f7846816b5 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -3,7 +3,7 @@ pkgname=vscode version=1.61.0 revision=1 _electronver=13.3.0 -hostmakedepends="pkg-config python nodejs yarn tar git" +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" short_desc="Microsoft Code for Linux" @@ -45,7 +45,7 @@ do_build() { /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 + yarn install --ignore-engines --arch=x64 export CFLAGS="$CFLAGS -I/usr/include/node" yarn run gulp vscode-linux-x64-min }