[arch-commits] Commit in code/trunk (6 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Nov 29 01:32:16 UTC 2018
Date: Thursday, November 29, 2018 @ 01:32:16
Author: eschwartz
Revision: 410494
upgpkg: code 1.29.1-1
upstream release
fixes FTBFS
Resolve FS#60132 - [code] App should start in background unless using the "-w" (wait) cli flag
Added:
code/trunk/code-liveshare.diff
code/trunk/product_json.diff
Modified:
code/trunk/PKGBUILD
code/trunk/code.sh
Deleted:
code/trunk/code-liveshare.patch
code/trunk/product_json.patch
----------------------+
PKGBUILD | 26 ++++++++++++++++----------
code-liveshare.diff | 12 ++++++++++++
code-liveshare.patch | 11 -----------
code.sh | 2 +-
product_json.diff | 21 +++++++++++++++++++++
product_json.patch | 19 -------------------
6 files changed, 50 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-28 23:32:04 UTC (rev 410493)
+++ PKGBUILD 2018-11-29 01:32:16 UTC (rev 410494)
@@ -4,23 +4,24 @@
pkgname=code
pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
-pkgver=1.27.2
+pkgver=1.29.1
pkgrel=1
arch=('x86_64')
url='https://github.com/Microsoft/vscode'
license=('MIT')
depends=('electron' 'libsecret' 'libxkbfile')
-makedepends=('git' 'gulp' 'npm' 'python2' 'yarn')
+# doesn't build without old nodejs: https://github.com/Microsoft/vscode/issues/49292
+makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-carbon')
source=("$pkgname::git+https://github.com/Microsoft/vscode.git#tag=$pkgver"
'code.js'
'code.sh'
- 'product_json.patch'
- 'code-liveshare.patch')
+ 'product_json.diff'
+ 'code-liveshare.diff')
sha512sums=('SKIP'
- 'd6d76d745372466936e516af7cacd146e7c90def5bba2eb03223b740675b810de00fff79a3f1cc8d29277f1d215ead5096aebb5ebeb52d25d8055e9c0d802bb9'
- 'a857b52b5075bed2df9860da4a9a7772351a1f4226e1bcac4578c31801caec61c785d30f49785c8816709a8d0b11c12696a49c4942c26d130a10618ce2c73d6b'
- '7f85387542987c45a6d0e23424eda9e702dc9c6a789cde96ed6e5d386bd294eae8a6c7b32c7ae18d8071063e83a1033c215d0f5f5e0b1040466ce4b7c3969f2c'
- '6080b9d30b2c852a831d4fa98be94e42eb7d94dfd5813bbe28410d031191c20563e4288d6b0062c74b635a962c3eba3533fcebeff1f67b4a8005a167c2f7fbf2')
+ '814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
+ '0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
+ '3c4bf0942ba9f1ba33937cc08e87caa8d6c030b862f99b2bac9ce6665739dd6a5f5a255b617c3f27ffd49df35563efa32f2c1a6240f9e19f16356bb12edac891'
+ '0bd10ca06dea22854e47fc45d833756ee8d7bf714c88f63feef44e0b0b5da052fba3c27d001865e3389f391cd7b888d92dc0ba44029fa5c736225da3cf2f9a46')
# Even though we don't officially support other archs, let's
# allow the user to use this PKGBUILD to compile the package
@@ -46,7 +47,7 @@
# This patch no longer contains proprietary modifications.
# See https://github.com/Microsoft/vscode/issues/31168 for details.
- patch -p0 < ../product_json.patch
+ patch -p1 < ../product_json.diff
# Set the commit and build date
local _commit=$(git rev-parse HEAD)
@@ -54,7 +55,7 @@
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 < ../code-liveshare.patch
+ patch -p1 < ../code-liveshare.diff
# Build native modules for system electron
local _target=$(</usr/lib/electron/version)
@@ -71,6 +72,11 @@
}
build() {
+ # https://github.com/mapbox/node-sqlite3/issues/1044
+ mkdir -p path
+ ln -sf /usr/bin/python2 path/python
+ export PATH="$PWD/path:$PATH"
+
cd $pkgname
yarn install --arch=$_vscode_arch
Added: code-liveshare.diff
===================================================================
--- code-liveshare.diff (rev 0)
+++ code-liveshare.diff 2018-11-29 01:32:16 UTC (rev 410494)
@@ -0,0 +1,12 @@
+diff --git a/product.json b/product.json
+index b250c66fc4..8a9befcfbb 100644
+--- a/product.json
++++ b/product.json
+@@ -19,6 +19,7 @@
+ "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
+ "urlProtocol": "code-oss",
+ "extensionAllowedProposedApi": [
++ "ms-vsliveshare.vsliveshare",
+ "ms-vscode.references-view"
+ ],
+ "quality": "stable",
Deleted: code-liveshare.patch
===================================================================
--- code-liveshare.patch 2018-11-28 23:32:04 UTC (rev 410493)
+++ code-liveshare.patch 2018-11-29 01:32:16 UTC (rev 410494)
@@ -1,11 +0,0 @@
-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"
- ],
Modified: code.sh
===================================================================
--- code.sh 2018-11-28 23:32:04 UTC (rev 410493)
+++ code.sh 2018-11-29 01:32:16 UTC (rev 410494)
@@ -1,3 +1,3 @@
#!/bin/bash
-exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
+ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
Added: product_json.diff
===================================================================
--- product_json.diff (rev 0)
+++ product_json.diff 2018-11-29 01:32:16 UTC (rev 410494)
@@ -0,0 +1,21 @@
+diff --git a/product.json b/product.json
+index eb6526c2d8..7753d2c5eb 100644
+--- a/product.json
++++ b/product.json
+@@ -20,5 +20,15 @@
+ "urlProtocol": "code-oss",
+ "extensionAllowedProposedApi": [
+ "ms-vscode.references-view"
+- ]
++ ],
++ "quality": "stable",
++ "extensionsGallery": {
++ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
++ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
++ "itemUrl": "https://marketplace.visualstudio.com/items"
++ },
++ "documentationUrl": "https://github.com/microsoft/vscode-docs",
++ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
++ "commit": "@COMMIT@",
++ "date": "@DATE@"
+ }
Deleted: product_json.patch
===================================================================
--- product_json.patch 2018-11-28 23:32:04 UTC (rev 410493)
+++ product_json.patch 2018-11-29 01:32:16 UTC (rev 410494)
@@ -1,19 +0,0 @@
---- product.json 2018-09-13 23:01:59.345056949 +0100
-+++ product.json 2018-09-13 23:02:50.748800382 +0100
-@@ -21,5 +21,15 @@
- "extensionAllowedProposedApi": [
- "ms-vscode.node-debug",
- "ms-vscode.node-debug2"
-- ]
-+ ],
-+ "quality": "stable",
-+ "extensionsGallery": {
-+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
-+ "itemUrl": "https://marketplace.visualstudio.com/items"
-+ },
-+ "documentationUrl": "https://github.com/microsoft/vscode-docs",
-+ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
-+ "commit": "@COMMIT@",
-+ "date": "@DATE@"
- }
More information about the arch-commits
mailing list