vscode: update to 1.40.0. (skip ci)

vscode: update to 1.40.1.
(ci skip)

vscode: update to 1.40.2.
(ci skip)
This commit is contained in:
Toby Merz 2019-11-10 08:11:51 +01:00 committed by Helmut Pozimski
parent 392ca100f1
commit 987e1b44c7
4 changed files with 30 additions and 17 deletions

View file

@ -1,5 +1,5 @@
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh 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 --- a/resources/linux/bin/code.sh
+++ b/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh
@@ -35,7 +35,7 @@ else @@ -35,7 +35,7 @@ else
@ -10,24 +10,37 @@ index 564f13ef95..0aa2b48fab 100755
+ VSCODE_PATH="/usr/lib/@@NAME@@" + VSCODE_PATH="/usr/lib/@@NAME@@"
fi fi
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 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 --- a/resources/linux/code.desktop
+++ b/resources/linux/code.desktop +++ b/resources/linux/code.desktop
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
Name=@@NAME_LONG@@ Name=@@NAME_LONG@@
Comment=Code Editing. Redefined. Comment=Code Editing. Redefined.
GenericName=Text Editor GenericName=Text Editor
-Exec=@@EXEC@@ --unity-launch %F -Exec=@@EXEC@@ --no-sandbox --unity-launch %F
+Exec=/usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F +Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --unity-launch %F
Icon=@@ICON@@ Icon=@@ICON@@
Type=Application Type=Application
StartupNotify=false StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode; @@ -14,5 +14,5 @@ Keywords=vscode;
[Desktop Action new-empty-window] [Desktop Action new-empty-window]
Name=New Empty Window Name=New Empty Window
-Exec=@@EXEC@@ --new-window %F -Exec=@@EXEC@@ --no-sandbox --new-window %F
+Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F +Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --new-window %F
Icon=@@ICON@@ Icon=@@ICON@@

View file

@ -1,10 +1,10 @@
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js 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 --- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js
@@ -323,7 +323,15 @@ function packageTask(platform, arch, opts) { @@ -257,7 +257,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
if (platform === 'win32') { 'resources/win32/code_150x150.png'
all = es.merge(all, gulp.src(['resources/win32/code_file.ico', 'resources/win32/code_70x70.png', 'resources/win32/code_150x150.png'], { base: '.' })); ], { base: '.' }));
} else if (platform === 'linux') { } else if (platform === 'linux') {
- all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); - all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
+ const icon = gulp.src('resources/linux/code.png', { base: '.' }); + const icon = gulp.src('resources/linux/code.png', { base: '.' });

View file

@ -1,9 +1,9 @@
diff --git a/product.json b/product.json diff --git a/product.json b/product.json
index eb6526c2d8f6..2d7088359f0b 100644 index 759d76553339..6dccc0906900 100644
--- a/product.json --- a/product.json
+++ b/product.json +++ b/product.json
@@ -18,7 +18,15 @@ @@ -20,7 +20,15 @@
"darwinBundleIdentifier": "com.visualstudio.code.oss", "licenseFileName": "LICENSE.txt",
"reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
"urlProtocol": "code-oss", "urlProtocol": "code-oss",
+ "quality": "stable", + "quality": "stable",

View file

@ -1,6 +1,6 @@
# Template file for 'vscode' # Template file for 'vscode'
pkgname=vscode pkgname=vscode
version=1.39.0 version=1.40.2
revision=1 revision=1
hostmakedepends="pkg-config python nodejs-lts yarn" hostmakedepends="pkg-config python nodejs-lts yarn"
makedepends="libxkbfile-devel libsecret-devel" makedepends="libxkbfile-devel libsecret-devel"
@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT" license="MIT"
homepage="https://code.visualstudio.com/" homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
checksum=a2e3a718e3b10af4b4022315e35e6e144beea37b03deb3874054acbc9f86b514 checksum=ee8a230935c0d6c2420007c3739a60c891e7826926392c2b9617048b3b5a8ae3
patch_args="-Np1" patch_args="-Np1"
# Due to electron # Due to electron