From b6372471fe4fcbfba728df73b0b1efaa8e87501e Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Mon, 22 Jun 2020 08:45:09 +0200 Subject: [PATCH 1/2] vscode: update to 1.47.0. [ci skip] --- srcpkgs/vscode/patches/remove_git_command.patch | 10 ++++++++++ srcpkgs/vscode/template | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/vscode/patches/remove_git_command.patch diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch new file mode 100644 index 00000000000..a99643c055f --- /dev/null +++ b/srcpkgs/vscode/patches/remove_git_command.patch @@ -0,0 +1,10 @@ +diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js +index ef8fa4a47f66..7b8b710636a7 100644 +--- a/build/npm/postinstall.js ++++ b/build/npm/postinstall.js +@@ -73,5 +73,3 @@ yarnInstall('test/automation'); // node modules required for smoketest + yarnInstall('test/smoke'); // node modules required for smoketest + yarnInstall('test/integration/browser'); // node modules required for integration + yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron +- +-cp.execSync('git config pull.rebase true'); diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index d870454e6f9..eacfca356bc 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.46.0 +version=1.47.0 revision=1 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar" makedepends="libxkbfile-devel libsecret-devel" @@ -10,7 +10,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=5bf4d51773bb26a484e0063b668cba38b5f7451cb77be230fbf64fa44d498ad8 +checksum=63e70521f11ab18643261f1bf779dc1a95855ea830010ab5481caf8b58fc5fac patch_args="-Np1" # Due to electron From 22910f68c431d2fde83e901712cd50349f19d7ec Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Thu, 16 Jul 2020 10:01:46 +0200 Subject: [PATCH 2/2] vscode: update to 1.47.1. --- srcpkgs/vscode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index eacfca356bc..018d8051fbf 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.47.0 +version=1.47.1 revision=1 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar" makedepends="libxkbfile-devel libsecret-devel" @@ -10,7 +10,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=63e70521f11ab18643261f1bf779dc1a95855ea830010ab5481caf8b58fc5fac +checksum=448758d4d71cb4d815d2e7642d793ff440c1140aaabd9d02000140d057e432f5 patch_args="-Np1" # Due to electron