vscode: update to 1.58.0

This commit is contained in:
Alex Lohr 2021-07-09 11:15:47 +02:00 committed by Érico Nogueira Rolim
parent 1e42640ebb
commit 5387b64a2d
3 changed files with 12 additions and 12 deletions

View file

@ -12,28 +12,28 @@ index 06973937f14..78f72c9e9ed 100755
fi
diff --git a/resources/linux/code-url-handler.desktop b/resources/linux/code-url-handler.desktop
index b85525fbd04..bab6df4eeb5 100644
index 7106e0e0969..faaff89d71c 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@@/bin/@@NAME@@ --no-sandbox --open-url %U
-Exec=@@EXEC@@ --open-url %U
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --open-url %U
Icon=@@ICON@@
Type=Application
NoDisplay=true
diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
index 62d6bfc47b4..a014f6748d0 100755
index ab3b79a011b..cdc88ef68a4 100755
--- 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@@ --no-sandbox --unity-launch %F
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --no-sandbox --unity-launch %F
-Exec=@@EXEC@@ --unity-launch %F
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --unity-launch %F
Icon=@@ICON@@
Type=Application
StartupNotify=false
@ -41,6 +41,6 @@ index 62d6bfc47b4..a014f6748d0 100755
[Desktop Action new-empty-window]
Name=New Empty Window
-Exec=@@EXEC@@ --no-sandbox --new-window %F
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --no-sandbox --new-window %F
-Exec=@@EXEC@@ --new-window %F
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --new-window %F
Icon=@@ICON@@

View file

@ -1,5 +1,5 @@
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 18ccef884a9d..61acb0a4d10b 100644
index 2d973599343..61acb0a4d10 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -87,5 +87,3 @@ runtime "${runtime}"`;
@ -7,4 +7,4 @@ index 18ccef884a9d..61acb0a4d10b 100644
yarnInstall(watchPath);
}
-
-cp.execSync('git config pull.rebase true');
-cp.execSync('git config pull.rebase merges');

View file

@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
version=1.57.1
version=1.58.0
revision=1
_electronver=12.0.9
hostmakedepends="pkg-config python nodejs yarn tar git"
@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
checksum=a6609493cacf1cd2796c9c923fc59193feee2ff106c4369affe9d2dcef81a20c
checksum=4797c34c04a65265a094a5bdb877c036fda565b7c1bbad4aeee9656e6e46dbbd
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"