Backport fix for failure to determine ts version

1 files changed, 5 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 445689c5e4ec..b197d2d1e6a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,9 +21,11 @@ conflicts=('vscode-oss')
 provides=('vscode-oss')
 
 source=("vscode::git+https://github.com/Microsoft/vscode#commit=${_commit}"
+        "0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch"
         "startup_script.patch"
         "${pkgname}.desktop")
 sha256sums=('SKIP'
+            'aeeb01ddf5c8e6d5bb9aef6424f858c37088dd0f53ddb10f791316c3c90d1a07'
             '8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d'
             'd140d0de9998a2a886a6d2ff23f356f8b68c8aae5a53c33ec87826e5d7ad3529')
 
@@ -53,6 +55,8 @@ esac
 prepare() {
     cd "${srcdir}/vscode"
 
+    patch -p1 -i ../0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch
+
     if (( VSCODE_NONFREE )); then
         patch -p1 -i "${srcdir}/product_json.patch"
         _datestamp=$(date -u -Is | sed 's/\+00:00/Z/')
@@ -96,7 +100,7 @@ build() {
     # The default memory limit may be too low for current versions of node
     # to successfully build vscode.  Uncomment this to set it to 2GB, or
     # change it if this number still doesn't work for your system.
-    #mem_limit="--max_old_space_size=2048"
+    mem_limit="--max_old_space_size=2048"
     /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-${_vscode_arch}
 
     # Patch the startup script to know where the app is installed, rather