summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hansen2018-05-08 09:53:34 -0700
committerMichael Hansen2018-05-08 09:53:34 -0700
commit2c88d66f6f9d0e4c01d1dfe189e5bf0d7a6f4bc7 (patch)
tree05216b5c8ebe83b8f37fc4b3c3045c1582d4d6ee
parentef907a0b9b4c26655e035c01e58ed90641eae73d (diff)
downloadaur-2c88d66f6f9d0e4c01d1dfe189e5bf0d7a6f4bc7.tar.gz
Add missing API to product.json to allow live-share to work
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD13
-rw-r--r--code-liveshare.patch11
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 357df143b810..db5a699d5f27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri May 4 16:09:32 UTC 2018
+# Tue May 8 16:52:57 UTC 2018
pkgbase = code
pkgdesc = Microsoft Code -- The Open Source build of Visual Studio Code (vscode)
pkgver = 1.23.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Microsoft/vscode
arch = i686
arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = code
license = MIT
makedepends = npm
makedepends = nodejs>=8.0
+ makedepends = nodejs<10.0
makedepends = gulp
makedepends = python2
makedepends = git
@@ -31,10 +32,12 @@ pkgbase = code
source = code.desktop
source = startup_script.patch
source = product_json.patch
+ source = code-liveshare.patch
sha256sums = SKIP
sha256sums = cd10a8532c0722298098cd9657df4ef05fcfe952e5be41f2294f50bb562a23dc
sha256sums = 8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d
sha256sums = 055bd73b72d7289dfc3834f2e7b2359d8c5ffea6f2fd266df7bad96bb6a7f3f6
+ sha256sums = 90b8915d8195546088e845f3205fb965e941561d309c8b462bb0b22a159e041c
pkgname = code
diff --git a/PKGBUILD b/PKGBUILD
index 001a2e5d474c..e3da1329afb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
pkgname=code
pkgdesc='Microsoft Code -- The Open Source build of Visual Studio Code (vscode)'
pkgver=1.23.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'armv7h')
url='https://github.com/Microsoft/vscode'
license=('MIT')
-makedepends=('npm' 'nodejs>=8.0' 'gulp' 'python2' 'git' 'yarn')
+makedepends=('npm' 'nodejs>=8.0' 'nodejs<10.0' 'gulp' 'python2' 'git' 'yarn')
depends=('gtk2' 'gconf' 'libnotify' 'libxss' 'libxtst' 'libxkbfile' 'nss'
'alsa-lib')
conflicts=('vscode-oss' 'visual-studio-code-oss')
@@ -17,11 +17,13 @@ provides=('vscode-oss' 'visual-studio-code-oss')
source=("vscode::git+https://github.com/Microsoft/vscode#tag=${pkgver}"
"${pkgname}.desktop"
"startup_script.patch"
- "product_json.patch")
+ "product_json.patch"
+ "code-liveshare.patch")
sha256sums=('SKIP'
'cd10a8532c0722298098cd9657df4ef05fcfe952e5be41f2294f50bb562a23dc'
'8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d'
- '055bd73b72d7289dfc3834f2e7b2359d8c5ffea6f2fd266df7bad96bb6a7f3f6')
+ '055bd73b72d7289dfc3834f2e7b2359d8c5ffea6f2fd266df7bad96bb6a7f3f6'
+ '90b8915d8195546088e845f3205fb965e941561d309c8b462bb0b22a159e041c')
case "$CARCH" in
i686)
@@ -49,6 +51,9 @@ prepare() {
local _datestamp=$(date -u -Is | sed 's/\+00:00/Z/')
sed -e "s/@COMMIT@/${_commit}/" -e "s/@DATE@/${_datestamp}/" \
-i product.json
+
+ # See https://github.com/MicrosoftDocs/live-share/issues/262 for details
+ patch -p1 -i "${srcdir}/code-liveshare.patch"
}
build() {
diff --git a/code-liveshare.patch b/code-liveshare.patch
new file mode 100644
index 000000000000..2654bc75fc44
--- /dev/null
+++ b/code-liveshare.patch
@@ -0,0 +1,11 @@
+diff -rupN a/product.json b/product.json
+--- a/product.json 2018-05-08 09:26:25.618099994 -0700
++++ b/product.json 2018-05-08 09:26:47.388338276 -0700
+@@ -17,6 +17,7 @@
+ "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
+ "urlProtocol": "code-oss",
+ "extensionAllowedProposedApi": [
++ "ms-vsliveshare.vsliveshare",
+ "ms-vscode.node-debug",
+ "ms-vscode.node-debug2"
+ ],