From e1ca38bee41907a5cf1d5731e91e753a057b0cc3 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Fri, 12 Jun 2020 11:55:45 +0200 Subject: [PATCH] vscode: update to 1.46.0 --- srcpkgs/vscode/patches/fix_dir.patch | 2 +- srcpkgs/vscode/patches/gulp.patch | 2 +- srcpkgs/vscode/patches/product.patch | 39 ++++++++++++++-------------- srcpkgs/vscode/template | 4 +-- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch index 799f7ec915..f4251e89bc 100644 --- a/srcpkgs/vscode/patches/fix_dir.patch +++ b/srcpkgs/vscode/patches/fix_dir.patch @@ -2,7 +2,7 @@ diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index 516c05e4ee08..bddc6f0cef22 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh -@@ -35,7 +35,7 @@ else +@@ -36,7 +36,7 @@ else VSCODE_PATH="$(dirname $(readlink -f $0))/.." else # else use the standard install location diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch index f8eec1cb4f..360c03a8c1 100644 --- a/srcpkgs/vscode/patches/gulp.patch +++ b/srcpkgs/vscode/patches/gulp.patch @@ -2,7 +2,7 @@ diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 93a943aba0be..5ab9be8c4bb5 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -257,7 +257,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -258,7 +258,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op 'resources/win32/code_150x150.png' ], { base: '.' })); } else if (platform === 'linux') { diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index f18a9fea49..efd45b1c83 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -2,22 +2,23 @@ diff --git a/product.json b/product.json index 335caa71f6b0..b06b418f15c1 100644 --- a/product.json +++ b/product.json -@@ -20,10 +20,18 @@ - "licenseFileName": "LICENSE.txt", - "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", - "urlProtocol": "code-oss", -+ "quality": "stable", -+ "documentationUrl": "https://github.com/microsoft/vscode-docs", -+ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "extensionAllowedProposedApi": [ - "ms-vscode.vscode-js-profile-table", - "ms-vscode.references-view" - ], -+ "extensionsGallery": { -+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", -+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", -+ "itemUrl": "https://marketplace.visualstudio.com/items" -+ }, - "builtInExtensions": [ - { - "name": "ms-vscode.node-debug", +@@ -22,12 +20,20 @@ + "licenseFileName": "LICENSE.txt", + "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", + "urlProtocol": "code-oss", ++ "quality": "stable", ++ "documentationUrl": "https://github.com/microsoft/vscode-docs", ++ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", + "extensionAllowedProposedApi": [ + "ms-vscode.vscode-js-profile-flame", + "ms-vscode.vscode-js-profile-table", + "ms-vscode.references-view" + ], ++ "extensionsGallery": { ++ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", ++ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", ++ "itemUrl": "https://marketplace.visualstudio.com/items" ++ }, + "builtInExtensions": [ + { + "name": "ms-vscode.node-debug", diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6b426ae699..d870454e6f 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.45.1 +version=1.46.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=5436bd5e0d1b2490ed34c930c650ad7761aec08b40e99691c03d972a80cbf724 +checksum=5bf4d51773bb26a484e0063b668cba38b5f7451cb77be230fbf64fa44d498ad8 patch_args="-Np1" # Due to electron