Updates for latest changes on master, and add ulimit hack

4 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 508b07da9038..d694ba155a5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 18 23:07:29 UTC 2017
+# Tue Apr 10 21:32:50 UTC 2018
 pkgbase = code-git
-	pkgdesc = Microsoft Code for Linux, Open Source version from git
-	pkgver = 1.16.0.r4621.g783a0aafad
+	pkgdesc = Microsoft Code for Linux, Open Source version from git (vscode)
+	pkgver = 1.16.0.r8976.g7bd29a4f90
 	pkgrel = 1
 	url = https://github.com/Microsoft/vscode
 	arch = i686
@@ -10,7 +10,7 @@ pkgbase = code-git
 	arch = armv7h
 	license = MIT
 	makedepends = npm
-	makedepends = nodejs>=6.8.0
+	makedepends = nodejs>=8.0
 	makedepends = gulp
 	makedepends = python2
 	makedepends = git
@@ -30,9 +30,9 @@ pkgbase = code-git
 	source = startup_script.patch
 	source = product_json.patch
 	sha256sums = SKIP
-	sha256sums = 4507d6aac23cc1135feb68c1fcaa8b4b41b42f4806575d38de0f93474a3fb8db
+	sha256sums = dd212d343a02466f04bd9def162428ac997b53c4c839cea220ab61382d01f538
 	sha256sums = 7447807230c09b80529e5cde4a1abfbb687937b16790b77a227ae39ba4c603ce
-	sha256sums = c402b3bd77530deea42315a9fb0fa4165926ff003179e0ac28b82c3f9acc93b4
+	sha256sums = 2a26fd93719970069da0a326b5ed77592234ffc6d05587b4d5bb8242c7f4c9b1
 
 pkgname = code-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 477058797e9e..7f1dcdeca5f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: Francisco Magalhães <franmagneto gmail com>
 
 pkgname=code-git
-pkgdesc='Microsoft Code for Linux, Open Source version from git'
-pkgver=1.16.0.r4621.g783a0aafad
+pkgdesc='Microsoft Code for Linux, Open Source version from git (vscode)'
+pkgver=1.16.0.r8976.g7bd29a4f90
 pkgrel=1
 arch=('i686' 'x86_64' 'armv7h')
 url='https://github.com/Microsoft/vscode'
 license=('MIT')
-makedepends=('npm' 'nodejs>=6.8.0' 'gulp' 'python2' 'git' 'yarn')
+makedepends=('npm' 'nodejs>=8.0' 'gulp' 'python2' 'git' 'yarn')
 depends=('gtk2' 'gconf' 'libnotify' 'libxss' 'libxtst' 'libxkbfile' 'nss'
          'alsa-lib')
 conflicts=('visual-studio-code-git')
@@ -19,9 +19,9 @@ source=("git+https://github.com/Microsoft/vscode"
         "startup_script.patch"
         "product_json.patch")
 sha256sums=('SKIP'
-            '4507d6aac23cc1135feb68c1fcaa8b4b41b42f4806575d38de0f93474a3fb8db'
+            'dd212d343a02466f04bd9def162428ac997b53c4c839cea220ab61382d01f538'
             '7447807230c09b80529e5cde4a1abfbb687937b16790b77a227ae39ba4c603ce'
-            'c402b3bd77530deea42315a9fb0fa4165926ff003179e0ac28b82c3f9acc93b4')
+            '2a26fd93719970069da0a326b5ed77592234ffc6d05587b4d5bb8242c7f4c9b1')
 
 case "$CARCH" in
     i686)
@@ -61,11 +61,21 @@ build() {
 
     yarn install --arch=${_vscode_arch}
 
+    if ! ulimit -n 10000; then
+        echo
+        echo "*** ERROR: Could not raise the soft file limit. ***"
+        echo "You may need to adjust your 'nofile' limit in /etc/security/limits.conf"
+        echo "and possibly also raise your kernel-enforced limit if necessary."
+        echo "Without this change, the gulp build will likely fail with EMFILE"
+        echo
+        exit 1
+    fi
+
     # 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"
-    /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-${_vscode_arch}
+    /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-${_vscode_arch}-min
 
     # Patch the startup script to know where the app is installed, rather
     # than guessing...
diff --git a/code-git.desktop b/code-git.desktop
index 8ed438c2ce52..c553857b2b5b 100644
--- a/code-git.desktop
+++ b/code-git.desktop
@@ -8,7 +8,7 @@ Exec=/usr/bin/code-git --unity-launch %F
 Icon=/usr/share/code-git/resources/app/resources/linux/code.png
 Type=Application
 StartupNotify=true
-StartupWMClass=code-oss
+StartupWMClass=Code - OSS
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;inode/directory;
 Actions=new-window;
diff --git a/product_json.patch b/product_json.patch
index 99ad76c9d160..8f49c1fe4a15 100644
--- a/product_json.patch
+++ b/product_json.patch
@@ -1,6 +1,6 @@
 diff -rupN a/product.json b/product.json
---- a/product.json	2016-09-08 14:48:45.419566181 -0700
-+++ b/product.json	2016-09-08 14:49:43.000000000 -0700
+--- a/product.json	2018-02-08 09:33:36.318636387 -0800
++++ b/product.json	2018-02-08 09:34:55.559500099 -0800
 @@ -1,6 +1,6 @@
  {
  	"nameShort": "Code - OSS",
@@ -9,14 +9,14 @@ diff -rupN a/product.json b/product.json
  	"applicationName": "code-oss",
  	"dataFolderName": ".vscode-oss",
  	"win32MutexName": "vscodeoss",
-@@ -12,5 +12,15 @@
- 	"win32AppUserModelId": "Microsoft.CodeOSS",
- 	"darwinBundleIdentifier": "com.visualstudio.code.oss",
- 	"reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
--	"urlProtocol": "code-oss"
+@@ -19,5 +19,15 @@
+ 	"extensionAllowedProposedApi": [
+ 		"ms-vscode.node-debug",
+ 		"ms-vscode.node-debug2"
+-	]
 -}
 \ No newline at end of file
-+	"urlProtocol": "code-oss",
++	],
 +	"quality": "stable",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",