From 1093104a53198157668c387f064b512392a5711d Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Sun, 10 Nov 2019 08:11:51 +0100 Subject: [PATCH] vscode: update to 1.40.0. (skip ci) --- srcpkgs/vscode/patches/fix_dir.patch | 29 ++++++++++++++++++++-------- srcpkgs/vscode/patches/gulp.patch | 16 +++++++-------- srcpkgs/vscode/patches/product.patch | 14 +++++++------- srcpkgs/vscode/template | 4 ++-- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch index 685e04f71d0..799f7ec9159 100644 --- a/srcpkgs/vscode/patches/fix_dir.patch +++ b/srcpkgs/vscode/patches/fix_dir.patch @@ -1,5 +1,5 @@ diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh -index 564f13ef95..0aa2b48fab 100755 +index 516c05e4ee08..bddc6f0cef22 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -35,7 +35,7 @@ else @@ -10,24 +10,37 @@ index 564f13ef95..0aa2b48fab 100755 + 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 +--- a/resources/linux/code-url-handler.desktop ++++ b/resources/linux/code-url-handler.desktop +@@ -2,7 +2,7 @@ + Name=@@NAME_LONG@@ - URL Handler + Comment=Code Editing. Redefined. + GenericName=Text Editor +-Exec=@@EXEC@@ --no-sandbox --open-url %U ++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --open-url %U + Icon=@@ICON@@ + Type=Application + NoDisplay=true diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop -index 1273bb2db7..eefe01f433 100644 +index b975e1094a2c..a094cc36e810 100644 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -2,7 +2,7 @@ Name=@@NAME_LONG@@ Comment=Code Editing. Redefined. GenericName=Text Editor --Exec=@@EXEC@@ --unity-launch %F -+Exec=/usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F +-Exec=@@EXEC@@ --no-sandbox --unity-launch %F ++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --unity-launch %F Icon=@@ICON@@ Type=Application StartupNotify=false @@ -14,5 +14,5 @@ Keywords=vscode; - + [Desktop Action new-empty-window] Name=New Empty Window --Exec=@@EXEC@@ --new-window %F -+Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F +-Exec=@@EXEC@@ --no-sandbox --new-window %F ++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --new-window %F Icon=@@ICON@@ diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch index cb1e22fc2e5..daa7f9c3d24 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 090db00ffebb..0c54098d2601 100644 +index 93a943aba0be..5ab9be8c4bb5 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -323,7 +323,15 @@ function packageTask(platform, arch, opts) { - if (platform === 'win32') { - all = es.merge(all, gulp.src(['resources/win32/code_file.ico', 'resources/win32/code_70x70.png', 'resources/win32/code_150x150.png'], { base: '.' })); - } else if (platform === 'linux') { +@@ -257,7 +257,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 090db00ffebb..0c54098d2601 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/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 58c7e9d6327..94e7c8de844 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,14 +1,14 @@ diff --git a/product.json b/product.json -index eb6526c2d8f6..2d7088359f0b 100644 +index 759d76553339..6dccc0906900 100644 --- a/product.json +++ b/product.json -@@ -18,7 +18,15 @@ - "darwinBundleIdentifier": "com.visualstudio.code.oss", - "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", - "urlProtocol": "code-oss", +@@ -20,7 +20,15 @@ + "licenseFileName": "LICENSE.txt", + "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", + "urlProtocol": "code-oss", + "quality": "stable", - "extensionAllowedProposedApi": [ - "ms-vscode.references-view" + "extensionAllowedProposedApi": [ + "ms-vscode.references-view" - ] + ], + "extensionsGallery": { diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index a428c44986a..94c17f40386 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.39.0 +version=1.40.0 revision=1 hostmakedepends="pkg-config python nodejs-lts yarn" 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=a2e3a718e3b10af4b4022315e35e6e144beea37b03deb3874054acbc9f86b514 +checksum=7fde41577334082b30b82cd9df5aa8c943ad1e99cff28ab095009c7fba4b6271 patch_args="-Np1" # Due to electron