Navigation Menu

Skip to content

Instantly share code, notes, and snippets.

@JacobHenner
Created November 22, 2018 16:19
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save JacobHenner/43dbad9175b50363256fc4f0d4ceacf1 to your computer and use it in GitHub Desktop.
Save JacobHenner/43dbad9175b50363256fc4f0d4ceacf1 to your computer and use it in GitHub Desktop.
1.29.1 patch for Arch's community-packaged (vs)code
Index: PKGBUILD
===================================================================
--- PKGBUILD (revision 409340)
+++ PKGBUILD (working copy)
@@ -1,26 +1,25 @@
# Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
# Contributor: Michael Hansen <zrax0111 gmail com>
# Contributor: Francisco Magalhães <franmagneto gmail com>
+# Contributor: Jacob Henner <code@ventricle.us>
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')
+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.patch')
sha512sums=('SKIP'
- 'd6d76d745372466936e516af7cacd146e7c90def5bba2eb03223b740675b810de00fff79a3f1cc8d29277f1d215ead5096aebb5ebeb52d25d8055e9c0d802bb9'
- 'a857b52b5075bed2df9860da4a9a7772351a1f4226e1bcac4578c31801caec61c785d30f49785c8816709a8d0b11c12696a49c4942c26d130a10618ce2c73d6b'
- '7f85387542987c45a6d0e23424eda9e702dc9c6a789cde96ed6e5d386bd294eae8a6c7b32c7ae18d8071063e83a1033c215d0f5f5e0b1040466ce4b7c3969f2c'
- '6080b9d30b2c852a831d4fa98be94e42eb7d94dfd5813bbe28410d031191c20563e4288d6b0062c74b635a962c3eba3533fcebeff1f67b4a8005a167c2f7fbf2')
+ '814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
+ '0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
+ 'cc3474094a66701bf785339b2eefb548e6001c3ee658852fe44c67fb5b2e789bda522f87a1ac85051e704a1d012439beb97fd000e8ead7457569178951f95132')
# Even though we don't officially support other archs, let's
# allow the user to use this PKGBUILD to compile the package
@@ -53,9 +52,6 @@
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 < ../code-liveshare.patch
-
# Build native modules for system electron
local _target=$(</usr/lib/electron/version)
sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
Index: code-liveshare.patch
===================================================================
--- code-liveshare.patch (revision 409340)
+++ code-liveshare.patch (nonexistent)
@@ -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"
- ],
Index: code.sh
===================================================================
--- code.sh (revision 409340)
+++ code.sh (working copy)
@@ -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 "$@"
Index: product_json.patch
===================================================================
--- product_json.patch (revision 409340)
+++ product_json.patch (working copy)
@@ -1,9 +1,11 @@
---- product.json 2018-09-13 23:01:59.345056949 +0100
-+++ product.json 2018-09-13 23:02:50.748800382 +0100
-@@ -21,5 +21,15 @@
+--- product.json
++++ product.json
+@@ -19,6 +19,17 @@
+ "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
+ "urlProtocol": "code-oss",
"extensionAllowedProposedApi": [
- "ms-vscode.node-debug",
- "ms-vscode.node-debug2"
++ "ms-vsliveshare.vsliveshare",
+ "ms-vscode.references-view"
- ]
+ ],
+ "quality": "stable",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment