diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | ts-compat.patch | 12 |
3 files changed, 22 insertions, 4 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jun 16 16:25:33 UTC 2017 +# Sat Jul 8 04:50:16 UTC 2017 pkgbase = visual-studio-code-oss pkgdesc = Visual Studio Code for Linux, Open Source version pkgver = 1.13.1 - pkgrel = 1 + pkgrel = 2 url = https://code.visualstudio.com/ arch = i686 arch = x86_64 @@ -26,9 +26,11 @@ pkgbase = visual-studio-code-oss conflicts = vscode-oss source = vscode::git+https://github.com/Microsoft/vscode#commit=379d2efb5539b09112c793d3d9a413017d736f89 source = startup_script.patch + source = ts-compat.patch source = visual-studio-code-oss.desktop sha256sums = SKIP sha256sums = 8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d + sha256sums = 91da6c2f2036813ba3d3ae5ce17cc4b437fadc6f18c693459bba2d7f68331e5b sha256sums = f853d7d998251223b0516928a2189e1e68a312bd732f18dc8d59892659beeae9 pkgname = visual-studio-code-oss @@ -9,7 +9,7 @@ pkgname=visual-studio-code-oss pkgdesc='Visual Studio Code for Linux, Open Source version' pkgver=1.13.1 -pkgrel=1 +pkgrel=2 _commit=379d2efb5539b09112c793d3d9a413017d736f89 arch=('i686' 'x86_64' 'armv7h') url='https://code.visualstudio.com/' @@ -21,10 +21,11 @@ conflicts=('vscode-oss') provides=('vscode-oss') source=("vscode::git+https://github.com/Microsoft/vscode#commit=${_commit}" - "startup_script.patch" + "startup_script.patch" "ts-compat.patch" "${pkgname}.desktop") sha256sums=('SKIP' '8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d' + '91da6c2f2036813ba3d3ae5ce17cc4b437fadc6f18c693459bba2d7f68331e5b' 'f853d7d998251223b0516928a2189e1e68a312bd732f18dc8d59892659beeae9') if (( VSCODE_NONFREE )); then @@ -53,6 +54,9 @@ esac prepare() { cd "${srcdir}/vscode" + # Typescript 2.4 breaks some parts of the build + patch -p1 -i "${srcdir}/ts-compat.patch" + if (( VSCODE_NONFREE )); then patch -p1 -i "${srcdir}/product_json.patch" _datestamp=$(date -u -Is | sed 's/\+00:00/Z/') diff --git a/ts-compat.patch b/ts-compat.patch new file mode 100644 index 000000000000..b6ef72c40a89 --- /dev/null +++ b/ts-compat.patch @@ -0,0 +1,12 @@ +diff -rupN a/build/package.json b/build/package.json +--- a/build/package.json 2017-07-07 21:34:44.166194668 -0700 ++++ b/build/package.json 2017-07-07 21:35:01.176380138 -0700 +@@ -13,7 +13,7 @@ + "documentdb": "^1.11.0", + "mime": "^1.3.4", + "minimist": "^1.2.0", +- "typescript": "^2.2.2", ++ "typescript": "2.3.4", + "xml2js": "^0.4.17" + }, + "scripts": { |