diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch | 134 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 5 insertions, 145 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Aug 25 21:56:53 UTC 2017 +# Thu Sep 7 20:57:02 UTC 2017 pkgbase = visual-studio-code-oss pkgdesc = Visual Studio Code for Linux, Open Source version - pkgver = 1.15.1 + pkgver = 1.16 pkgrel = 1 url = https://code.visualstudio.com/ arch = i686 @@ -24,12 +24,10 @@ pkgbase = visual-studio-code-oss depends = alsa-lib provides = vscode-oss conflicts = vscode-oss - source = vscode::git+https://github.com/Microsoft/vscode#commit=41abd21afdf7424c89319ee7cb0445cc6f376959 - source = 0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch + source = vscode::git+https://github.com/Microsoft/vscode#commit=aa42e6ef8184e8ab20ddaa5682b861bfb6f0b2ad source = startup_script.patch source = visual-studio-code-oss.desktop sha256sums = SKIP - sha256sums = aeeb01ddf5c8e6d5bb9aef6424f858c37088dd0f53ddb10f791316c3c90d1a07 sha256sums = 8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d sha256sums = d140d0de9998a2a886a6d2ff23f356f8b68c8aae5a53c33ec87826e5d7ad3529 diff --git a/0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch b/0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch deleted file mode 100644 index 534e5d4e1204..000000000000 --- a/0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 771ef9ede88c6845e1f30d7fff7c4a698f972ae8 Mon Sep 17 00:00:00 2001 -From: Matt Bierner <matb@microsoft.com> -Date: Thu, 17 Aug 2017 15:12:22 -0700 -Subject: [PATCH] Show invalid version string if ts version cannot be - determined - ---- - extensions/typescript/src/utils/api.ts | 55 +++++++++++----------- - extensions/typescript/src/utils/versionProvider.ts | 4 +- - 2 files changed, 30 insertions(+), 29 deletions(-) - -diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript/src/utils/api.ts -index 87749afc8e..4fa9f1d5cb 100644 ---- a/extensions/typescript/src/utils/api.ts -+++ b/extensions/typescript/src/utils/api.ts -@@ -4,64 +4,65 @@ - *--------------------------------------------------------------------------------------------*/ - - import * as semver from 'semver'; -+import * as nls from 'vscode-nls'; -+const localize = nls.loadMessageBundle(); - - export default class API { -- public static readonly defaultVersion = new API('1.0.0'); -+ public static readonly defaultVersion = new API('1.0.0', '1.0.0'); - -- private readonly _version: string; -+ public static fromVersionString(versionString: string): API { -+ let version = semver.valid(versionString); -+ if (!version) { -+ return new API(localize('invalidVersion', 'invalid version'), '1.0.0'); -+ } - -- constructor( -- private readonly _versionString: string -- ) { -- this._version = semver.valid(_versionString); -- if (!this._version) { -- this._version = '1.0.0'; -- } else { -- // Cut of any prerelease tag since we sometimes consume those -- // on purpose. -- let index = _versionString.indexOf('-'); -- if (index >= 0) { -- this._version = this._version.substr(0, index); -- } -+ // Cut of any prerelease tag since we sometimes consume those on purpose. -+ const index = versionString.indexOf('-'); -+ if (index >= 0) { -+ version = version.substr(0, index); - } -+ return new API(versionString, version); - } - -- public get versionString(): string { -- return this._versionString; -- } -+ private constructor( -+ public readonly versionString: string, -+ private readonly version: string -+ ) { } -+ - - public has203Features(): boolean { -- return semver.gte(this._version, '2.0.3'); -+ return semver.gte(this.version, '2.0.3'); - } - - public has206Features(): boolean { -- return semver.gte(this._version, '2.0.6'); -+ return semver.gte(this.version, '2.0.6'); - } - - public has208Features(): boolean { -- return semver.gte(this._version, '2.0.8'); -+ return semver.gte(this.version, '2.0.8'); - } - - public has213Features(): boolean { -- return semver.gte(this._version, '2.1.3'); -+ return semver.gte(this.version, '2.1.3'); - } - - public has220Features(): boolean { -- return semver.gte(this._version, '2.2.0'); -+ return semver.gte(this.version, '2.2.0'); - } - - public has222Features(): boolean { -- return semver.gte(this._version, '2.2.2'); -+ return semver.gte(this.version, '2.2.2'); - } - - public has230Features(): boolean { -- return semver.gte(this._version, '2.3.0'); -+ return semver.gte(this.version, '2.3.0'); - } - - public has234Features(): boolean { -- return semver.gte(this._version, '2.3.4'); -+ return semver.gte(this.version, '2.3.4'); - } -+ - public has240Features(): boolean { -- return semver.gte(this._version, '2.4.0'); -+ return semver.gte(this.version, '2.4.0'); - } - } -\ No newline at end of file -diff --git a/extensions/typescript/src/utils/versionProvider.ts b/extensions/typescript/src/utils/versionProvider.ts -index 57edf0d511..a0a61db387 100644 ---- a/extensions/typescript/src/utils/versionProvider.ts -+++ b/extensions/typescript/src/utils/versionProvider.ts -@@ -41,7 +41,7 @@ export class TypeScriptVersion { - // Allow TS developers to provide custom version - const tsdkVersion = workspace.getConfiguration().get<string | undefined>('typescript.tsdk_version', undefined); - if (tsdkVersion) { -- return new API(tsdkVersion); -+ return API.fromVersionString(tsdkVersion); - } - - return undefined; -@@ -78,7 +78,7 @@ export class TypeScriptVersion { - if (!desc || !desc.version) { - return undefined; - } -- return desc.version ? new API(desc.version) : undefined; -+ return desc.version ? API.fromVersionString(desc.version) : undefined; - } - } - --- -2.14.1 - @@ -8,9 +8,9 @@ pkgname=visual-studio-code-oss pkgdesc='Visual Studio Code for Linux, Open Source version' -pkgver=1.15.1 +pkgver=1.16 pkgrel=1 -_commit=41abd21afdf7424c89319ee7cb0445cc6f376959 +_commit=aa42e6ef8184e8ab20ddaa5682b861bfb6f0b2ad arch=('i686' 'x86_64' 'armv7h') url='https://code.visualstudio.com/' license=('MIT') @@ -21,11 +21,9 @@ conflicts=('vscode-oss') provides=('vscode-oss') source=("vscode::git+https://github.com/Microsoft/vscode#commit=${_commit}" - "0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch" "startup_script.patch" "${pkgname}.desktop") sha256sums=('SKIP' - 'aeeb01ddf5c8e6d5bb9aef6424f858c37088dd0f53ddb10f791316c3c90d1a07' '8b2feded3382e5bf6b5b292c14083bfc536c05cd00f3235dd22b75b67fba134d' 'd140d0de9998a2a886a6d2ff23f356f8b68c8aae5a53c33ec87826e5d7ad3529') @@ -55,8 +53,6 @@ esac prepare() { cd "${srcdir}/vscode" - patch -p1 -i ../0001-Show-invalid-version-string-if-ts-version-cannot-be-.patch - if (( VSCODE_NONFREE )); then patch -p1 -i "${srcdir}/product_json.patch" _datestamp=$(date -u -Is | sed 's/\+00:00/Z/') |