From c7868b819a570a98e48db7acd566e81d81d8770e Mon Sep 17 00:00:00 2001
From: Andre Barboza <bmg.andre@gmail.com>
Date: Sat, 21 Jan 2017 14:28:45 +0000
Subject: development/vscode: Fixed building errors.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/vscode/README             |  6 +++---
 development/vscode/slack-desc         |  6 +++---
 development/vscode/vscode-1.8.1.patch | 36 +++++++++++++++++++++++++++++++++++
 development/vscode/vscode.SlackBuild  |  3 ++-
 4 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 development/vscode/vscode-1.8.1.patch

(limited to 'development')

diff --git a/development/vscode/README b/development/vscode/README
index bd0779ab87..a96018d1c2 100644
--- a/development/vscode/README
+++ b/development/vscode/README
@@ -1,6 +1,6 @@
 Visual Studio Code.
 
-VS Code is a new type of tool that combines the simplicity of a code 
-editor with what developers need for their core edit-build-debug 
-cycle. Code provides comprehensive editing and debugging support, an 
+VS Code is a new type of tool that combines the simplicity of a code
+editor with what developers need for their core edit-build-debug
+cycle. Code provides comprehensive editing and debugging support, an
 extensibility model, and lightweight integration with existing tools.
diff --git a/development/vscode/slack-desc b/development/vscode/slack-desc
index bfac5700c4..3a0b6400d9 100644
--- a/development/vscode/slack-desc
+++ b/development/vscode/slack-desc
@@ -8,9 +8,9 @@
       |-----handy-ruler------------------------------------------------------|
 vscode: vscode (Build and debug modern web and cloud applications)
 vscode:
-vscode: VS Code is a new type of tool that combines the simplicity of a code 
-vscode: editor with what developers need for their core edit-build-debug 
-vscode: cycle. Code provides comprehensive editing and debugging support, an 
+vscode: VS Code is a new type of tool that combines the simplicity of a code
+vscode: editor with what developers need for their core edit-build-debug
+vscode: cycle. Code provides comprehensive editing and debugging support, an
 vscode: extensibility model, and lightweight integration with existing tools.
 vscode:
 vscode:
diff --git a/development/vscode/vscode-1.8.1.patch b/development/vscode/vscode-1.8.1.patch
new file mode 100644
index 0000000000..dd6e3475cf
--- /dev/null
+++ b/development/vscode/vscode-1.8.1.patch
@@ -0,0 +1,36 @@
+From f9ce2e16fcfb3699af9596d8f1e28a3ee8e27171 Mon Sep 17 00:00:00 2001
+From: Benjamin Pasero <benjpas@microsoft.com>
+Date: Mon, 9 Jan 2017 18:13:23 +0100
+Subject: [PATCH] fix compile errors
+
+---
+ extensions/vscode-api-tests/src/window.test.ts    | 2 +-
+ extensions/vscode-api-tests/src/workspace.test.ts | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/vscode-api-tests/src/window.test.ts b/extensions/vscode-api-tests/src/window.test.ts
+index 5cf72dd..9273df4 100644
+--- a/extensions/vscode-api-tests/src/window.test.ts
++++ b/extensions/vscode-api-tests/src/window.test.ts
+@@ -315,7 +315,7 @@ suite('window namespace tests', () => {
+ 		assert.equal(terminal.name, 'foo');
+ 
+ 		assert.throws(() => {
+-			terminal.name = 'bar';
++			(<any>terminal).name = 'bar';
+ 		}, 'Terminal.name should be readonly');
+ 	});
+ 
+diff --git a/extensions/vscode-api-tests/src/workspace.test.ts b/extensions/vscode-api-tests/src/workspace.test.ts
+index b963ab6..0b4e2c0 100644
+--- a/extensions/vscode-api-tests/src/workspace.test.ts
++++ b/extensions/vscode-api-tests/src/workspace.test.ts
+@@ -24,7 +24,7 @@ suite('workspace-namespace', () => {
+ 		assert.equal(config['config0'], true);
+ 		assert.equal(config['config4'], '');
+ 
+-		assert.throws(() => config['config4'] = 'valuevalue');
++		assert.throws(() => (<any>config)['config4'] = 'valuevalue');
+ 
+ 		assert.ok(config.has('nested.config1'));
+ 		assert.equal(config.get('nested.config1'), 42);
diff --git a/development/vscode/vscode.SlackBuild b/development/vscode/vscode.SlackBuild
index 6390a5cae8..ba70445420 100644
--- a/development/vscode/vscode.SlackBuild
+++ b/development/vscode/vscode.SlackBuild
@@ -62,6 +62,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/vscode-$VERSION.patch
 ./scripts/npm.sh install --arch=$BUILDARCH --unsafe-perm
 ./node_modules/.bin/gulp vscode-linux-${BUILDARCH}-min
 
@@ -82,7 +83,7 @@ install -m644 "${CWD}/${PRGNAM}.desktop" "${PKG}/usr/share/applications/${PRGNAM
 # copy vscode icon
 mkdir -p "${PKG}/usr/share/icons"
 install -m644 "${PKG}/opt/${PRGNAM}-${VERSION}/resources/app/resources/linux/code.png" \
-	"${PKG}/usr/share/icons/${PRGNAM}.png"
+        "${PKG}/usr/share/icons/${PRGNAM}.png"
 
 # copy license and slackbuild
 mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
-- 
cgit v1.2.3