From 000159dbe923f9591cf23a53a673401c5b4034b1 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Thu, 7 Feb 2019 08:50:17 +0100
Subject: [PATCH] vscode: update to 1.31.0.

---
 srcpkgs/vscode/INSTALL.msg           |  2 --
 srcpkgs/vscode/patches/fix_dir.patch | 29 +++++++++++++++++++----
 srcpkgs/vscode/patches/libgl.patch   | 35 ----------------------------
 srcpkgs/vscode/template              | 10 ++++----
 4 files changed, 30 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/vscode/INSTALL.msg
 delete mode 100644 srcpkgs/vscode/patches/libgl.patch

diff --git a/srcpkgs/vscode/INSTALL.msg b/srcpkgs/vscode/INSTALL.msg
deleted file mode 100644
index 5db338c335a..00000000000
--- a/srcpkgs/vscode/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-To use always software rendering create the file
-${HOME}/.config/Code - OSS/.libgl_always_software
diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index e4bc606f4bf..b2edcc729ca 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -3,10 +3,31 @@ index 55f50b6f1c14..16b73343e6ea 100755
 --- a/resources/linux/bin/code.sh
 +++ b/resources/linux/bin/code.sh
 @@ -26,7 +26,7 @@ else
-		VSCODE_PATH="$(dirname $(readlink -f $0))/.."
-	else
-		# else use the standard install location
+ 		VSCODE_PATH="$(dirname $(readlink -f $0))/.."
+ 	else
+ 		# else use the standard install location
 -		VSCODE_PATH="/usr/share/@@NAME@@"
 +		VSCODE_PATH="/usr/lib/@@NAME@@"
-	fi
+ 	fi
  fi
+ 
+diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
+index dbc7818cecf3..eefe01f43397 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=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
++Exec=/usr/lib/@@NAME@@/@@NAME@@ --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=/usr/share/@@NAME@@/@@NAME@@ --new-window %F
++Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F
+ Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/libgl.patch b/srcpkgs/vscode/patches/libgl.patch
deleted file mode 100644
index 11944ce5bba..00000000000
--- a/srcpkgs/vscode/patches/libgl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
-index 55f50b6f1c14..f03839c66095 100755
---- a/resources/linux/bin/code.sh
-+++ b/resources/linux/bin/code.sh
-@@ -30,6 +30,10 @@ else
-	fi
- fi
-
-+if [ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ]; then
-+	export LIBGL_ALWAYS_SOFTWARE=1
-+fi
-+
- ELECTRON="$VSCODE_PATH/@@NAME@@"
- CLI="$VSCODE_PATH/resources/app/out/cli.js"
- ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
-diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
-index f93060d565bd..d511dd86489d 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=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
-+Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F'
- Icon=@@ICON@@
- Type=Application
- StartupNotify=true
-@@ -14,5 +14,5 @@ Keywords=vscode;
-
- [Desktop Action new-empty-window]
- Name=New Empty Window
--Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F
-+Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/lib/@@NAME@@/@@NAME@@ --new-window %F'
- Icon=@@ICON@@
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 88cf668f96f..4d719c09c78 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,7 +1,7 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.30.2
-revision=2
+version=1.31.0
+revision=1
 hostmakedepends="pkg-config python nodejs-lts yarn"
 makedepends="libxkbfile-devel libsecret-devel"
 depends="GConf libXtst libxkbfile nss dejavu-fonts-ttf"
@@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7bf1c9c3c2814146906a6e38188d2f3284e128929e27c2c2dd0bcd7c6422be5e
+checksum=ac7d025b85519f4563eebd112d5deec48ac742b5dcfcff6c6fcfce36c01baeba
 patch_args="-Np1"
 
 # Due to electron
@@ -23,8 +23,8 @@ nostrip_files="code-oss"
 _mem_limit="--max_old_space_size=4095"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686)	broken="https://build.voidlinux.eu/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio"
-		_ARCH="ia32";;
+	i686)   broken="https://build.voidlinux.eu/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio"
+		    _ARCH="ia32";;
 	x86_64) _ARCH="x64";;
 esac