From 4a76e75a54c930ee72c3df014a08665325d9563c Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 7 Apr 2021 13:04:08 +0200 Subject: [PATCH] vscode: update to 1.55.0 --- srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 2 +- srcpkgs/vscode/patches/fix_dir.patch | 14 +++++++------- srcpkgs/vscode/patches/gulp.patch | 2 +- srcpkgs/vscode/patches/product.patch | 9 +++++---- srcpkgs/vscode/template | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch index cb7993a59f0..0f62f1b7e07 100644 --- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch +++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch @@ -1,5 +1,5 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index e3ca3514bb62..f9157b7cbc6c 100644 +index a06f3f63d89..67aa7c4a7aa 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -285,7 +285,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch index 8132ac7e28c..f27e7c28304 100644 --- a/srcpkgs/vscode/patches/fix_dir.patch +++ b/srcpkgs/vscode/patches/fix_dir.patch @@ -1,18 +1,18 @@ diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh -index 516c05e4ee08..bddc6f0cef22 100755 +index 06973937f14..78f72c9e9ed 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh -@@ -36,7 +36,7 @@ else - VSCODE_PATH="$(dirname $(readlink -f $0))/.." +@@ -44,7 +44,7 @@ else + VSCODE_PATH="$(dirname "$(readlink -f "$0")")/.." else # else use the standard install location - VSCODE_PATH="/usr/share/@@NAME@@" + VSCODE_PATH="/usr/lib/@@NAME@@" fi fi - + diff --git a/resources/linux/code-url-handler.desktop b/resources/linux/code-url-handler.desktop -index b85525fbd042..dc7617051b95 100644 +index b85525fbd04..bab6df4eeb5 100644 --- a/resources/linux/code-url-handler.desktop +++ b/resources/linux/code-url-handler.desktop @@ -2,7 +2,7 @@ @@ -25,7 +25,7 @@ index b85525fbd042..dc7617051b95 100644 Type=Application NoDisplay=true diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop -index b975e1094a2c..a094cc36e810 100644 +index 62d6bfc47b4..a014f6748d0 100755 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -2,7 +2,7 @@ @@ -38,7 +38,7 @@ index b975e1094a2c..a094cc36e810 100644 Type=Application StartupNotify=false @@ -14,5 +14,5 @@ Keywords=vscode; - + [Desktop Action new-empty-window] Name=New Empty Window -Exec=@@EXEC@@ --no-sandbox --new-window %F diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch index 0b11414bcc6..7870591997c 100644 --- a/srcpkgs/vscode/patches/gulp.patch +++ b/srcpkgs/vscode/patches/gulp.patch @@ -1,5 +1,5 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index e3ca3514bb62..b0942f2b9b89 100644 +index a06f3f63d89..7bdca3af3fb 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -273,7 +273,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index feb7f5891ba..eb7b91d8b97 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,8 +1,8 @@ diff --git a/product.json b/product.json -index 207bcf8f512e..572fbfb39b56 100644 +index 3facf29bc27..45e3fab95a7 100644 --- a/product.json +++ b/product.json -@@ -22,12 +22,20 @@ +@@ -22,6 +22,9 @@ "licenseFileName": "LICENSE.txt", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", @@ -12,8 +12,9 @@ index 207bcf8f512e..572fbfb39b56 100644 "extensionAllowedProposedApi": [ "ms-vscode.vscode-js-profile-flame", "ms-vscode.vscode-js-profile-table", - "ms-vscode.github-browser", - "ms-vscode.github-richnav" +@@ -30,6 +33,11 @@ + "ms-vscode.remotehub", + "ms-vscode.remotehub-insiders" ], + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index ee7d308e887..58a277841ef 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.54.3 +version=1.55.0 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=ea2cf3481b9a878aa5d4000289d238551d0ad4fe04ca2f3fea35bbe86026a369 +checksum=5a208d6cfaf35ea4d098c858faf2dff14092d74534c1b5966df87f1d5be24ef0 patch_args="-Np1" if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then