From 818b6ee449caf93bc2890abe6c7c8bbd9a59647d Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Wed, 10 Mar 2021 16:00:38 +0100 Subject: [PATCH] vscode: update to 1.54.1. --- .../vscode/patches/dont-download-ffmpeg.patch | 6 +++--- srcpkgs/vscode/patches/gulp.patch | 16 ++++++++-------- srcpkgs/vscode/template | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch index e428f74f52e..cb7993a59f0 100644 --- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch +++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch @@ -1,11 +1,11 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index d046aa71ed2f..0740fc225b3f 100644 +index e3ca3514bb62..f9157b7cbc6c 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -263,7 +263,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op - let result = all +@@ -285,7 +285,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 - .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true }))) + .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))) .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true })); diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch index 360c03a8c19..0b11414bcc6 100644 --- a/srcpkgs/vscode/patches/gulp.patch +++ b/srcpkgs/vscode/patches/gulp.patch @@ -1,11 +1,11 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index 93a943aba0be..5ab9be8c4bb5 100644 +index e3ca3514bb62..b0942f2b9b89 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -258,7 +258,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op - 'resources/win32/code_150x150.png' - ], { base: '.' })); - } else if (platform === 'linux') { +@@ -273,7 +273,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op + 'resources/win32/code_150x150.png' + ], { base: '.' })); + } else if (platform === 'linux') { - all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); + const icon = gulp.src('resources/linux/code.png', { base: '.' }); + @@ -16,6 +16,6 @@ index 93a943aba0be..5ab9be8c4bb5 100644 + .pipe(replace('@@ICON@@', `code-oss`)); + + all = es.merge(all, icon, desktop); - } else if (platform === 'darwin') { - const shortcut = gulp.src('resources/darwin/bin/code.sh') - .pipe(rename('bin/code')); + } else if (platform === 'darwin') { + const shortcut = gulp.src('resources/darwin/bin/code.sh') + .pipe(rename('bin/code')); diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 47a0307f30b..27c14c84e7a 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.53.2 +version=1.54.1 revision=1 _electronver=9.4.1 hostmakedepends="pkg-config python nodejs yarn tar git" @@ -11,7 +11,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=d83ec31b76815aaccb52ed10eb26a134563871f413ed21e8fe456ed89de500aa +checksum=0afd83b04b5ab0c9f7b4cae6d10abc16ca2d36b9dabc3080734cf48a41ce5f7e patch_args="-Np1" if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then