From a98d5c8bba0efce5ebc696726dafdc4959b6026c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 9 Jul 2021 11:15:47 +0200
Subject: [PATCH] vscode: update to 1.58.0

---
 srcpkgs/vscode/patches/fix_dir.patch            | 16 ++++++++--------
 srcpkgs/vscode/patches/remove_git_command.patch |  4 ++--
 srcpkgs/vscode/template                         |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index f27e7c283047..da193e702524 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -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@@
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 2818b47ab233..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -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');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 67907e21a31e..e036440f0982 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -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"