summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hansen2020-01-13 12:16:01 -0800
committerMichael Hansen2020-01-13 12:16:01 -0800
commitb6f0fb8c1dfeb78759dc8b92ba7c148cf2168141 (patch)
tree0436121a118e5ab308d7f81a8476f40b29ae36d3
parent92dbdef0908acb4a8a7465eaefacda28e8761c5c (diff)
downloadaur-b6f0fb8c1dfeb78759dc8b92ba7c148cf2168141.tar.gz
Update to use electron 7
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--code-git.sh2
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a3799943a7a..6960de7cb87d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = code-git
pkgdesc = The Open Source build of Visual Studio Code (vscode) editor - git latest
- pkgver = 1.38.0.r4227.g55e3649e40
+ pkgver = 1.38.0.r5565.g8d1456e210
pkgrel = 1
url = https://github.com/microsoft/vscode
arch = i686
@@ -13,7 +13,7 @@ pkgbase = code-git
makedepends = python2
makedepends = yarn
makedepends = nodejs-lts-dubnium
- depends = electron6
+ depends = electron
depends = libsecret
depends = libx11
depends = libxkbfile
@@ -27,7 +27,7 @@ pkgbase = code-git
source = code-liveshare.diff
sha512sums = SKIP
sha512sums = a97cbc79d76d2dad2ced74d66fa57b9a0aa3d82767d420b520bbaaf007c03ac60d61134668895ab4a8bd38951974c42afc59c03105ccc892742b34fee9b2c509
- sha512sums = 61da100b86e334f5a4880c1e612e5b9e7f61dda22aa8c52eec519f90efa25e298b361ee80c6c6ceceba4bc03de0e0addae47a0925b3fcbe6f50fc4324a652d01
+ sha512sums = 9bd93ec7ba946c005d3a12ea71ae2903593d17d3e4dcf55b4a5b612ebc82237338f0aaec59613eb77f355b0116aeb31320d0d32cd993233f140479ced44dfdbf
sha512sums = 8ec47e497287d67f37e7b669af416f43d5cdbd4574892867d7b95996ef5de53640b5bc919b06b177e1fd91cb005579d6ed0c17325117b9914ba7cf28f5f06e40
sha512sums = 0bd10ca06dea22854e47fc45d833756ee8d7bf714c88f63feef44e0b0b5da052fba3c27d001865e3389f391cd7b888d92dc0ba44029fa5c736225da3cf2f9a46
diff --git a/PKGBUILD b/PKGBUILD
index 5f50c76cf57c..4628b0d77701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
pkgname=code-git
pkgdesc='The Open Source build of Visual Studio Code (vscode) editor - git latest'
-pkgver=1.38.0.r4227.g55e3649e40
+pkgver=1.38.0.r5565.g8d1456e210
pkgrel=1
arch=('i686' 'x86_64' 'armv7h')
url='https://github.com/microsoft/vscode'
license=('MIT')
-depends=('electron6' 'libsecret' 'libx11' 'libxkbfile' 'ripgrep')
+depends=('electron' 'libsecret' 'libx11' 'libxkbfile' 'ripgrep')
makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-dubnium')
conflicts=('visual-studio-code-git')
provides=('visual-studio-code-git')
@@ -21,7 +21,7 @@ source=("git+https://github.com/Microsoft/vscode"
"code-liveshare.diff")
sha512sums=('SKIP'
'a97cbc79d76d2dad2ced74d66fa57b9a0aa3d82767d420b520bbaaf007c03ac60d61134668895ab4a8bd38951974c42afc59c03105ccc892742b34fee9b2c509'
- '61da100b86e334f5a4880c1e612e5b9e7f61dda22aa8c52eec519f90efa25e298b361ee80c6c6ceceba4bc03de0e0addae47a0925b3fcbe6f50fc4324a652d01'
+ '9bd93ec7ba946c005d3a12ea71ae2903593d17d3e4dcf55b4a5b612ebc82237338f0aaec59613eb77f355b0116aeb31320d0d32cd993233f140479ced44dfdbf'
'8ec47e497287d67f37e7b669af416f43d5cdbd4574892867d7b95996ef5de53640b5bc919b06b177e1fd91cb005579d6ed0c17325117b9914ba7cf28f5f06e40'
'0bd10ca06dea22854e47fc45d833756ee8d7bf714c88f63feef44e0b0b5da052fba3c27d001865e3389f391cd7b888d92dc0ba44029fa5c736225da3cf2f9a46')
@@ -67,7 +67,7 @@ prepare() {
patch -p1 -i "${srcdir}/code-liveshare.diff"
# Build native modules for system electron
- local _target=$(</usr/lib/electron6/version)
+ local _target=$(</usr/lib/electron/version)
sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
# Patch appdata and desktop file
diff --git a/code-git.sh b/code-git.sh
index f4f11e601499..a5525422fe25 100644
--- a/code-git.sh
+++ b/code-git.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-ELECTRON_RUN_AS_NODE=1 exec electron6 /usr/lib/code-git/out/cli.js /usr/lib/code-git/code-git.js "$@"
+ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code-git/out/cli.js /usr/lib/code-git/code-git.js "$@"