vscode: update to 1.59.0

This commit is contained in:
Alex Lohr 2021-08-06 21:36:05 +02:00 committed by Érico Nogueira Rolim
parent 429f71ad77
commit 7db0172fdf
4 changed files with 9 additions and 8 deletions

View file

@ -1,8 +1,8 @@
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a6e043f122c..2c537818fca 100644
index ad0e4717a66..4b301e85c3d 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
.pipe(util.skipDirectories())
.pipe(util.fixWin32DirectoryPermissions())
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523

View file

@ -1,8 +1,8 @@
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a6e043f122c..276823dede9 100644
index ad0e4717a66..d3c34a95ec9 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
'resources/win32/code_150x150.png'
], { base: '.' }));
} else if (platform === 'linux') {

View file

@ -1,10 +1,11 @@
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 2d973599343..61acb0a4d10 100644
index f86ceb779a9..61acb0a4d10 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -87,5 +87,3 @@ runtime "${runtime}"`;
@@ -87,6 +87,3 @@ runtime "${runtime}"`;
fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
yarnInstall(watchPath);
}
-
-cp.execSync('git config pull.rebase merges');
-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');

View file

@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
version=1.58.2
version=1.59.0
revision=1
_electronver=12.0.9
hostmakedepends="pkg-config python nodejs yarn tar git"
@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"