[arch-commits] Commit in code/trunk (PKGBUILD code.sh)

[Eli Schwartz]

    Date: Thursday, December 6, 2018 @ 23:16:31
  Author: eschwartz
Revision: 412004

upgpkg: code 1.29.1-4

rebuild with electron2 due to electron 3.x upgrade

Modified:
  code/trunk/PKGBUILD
  code/trunk/code.sh

----------+
 PKGBUILD |    8 ++++----
 code.sh  |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-06 23:09:31 UTC (rev 412003)
+++ PKGBUILD	2018-12-06 23:16:31 UTC (rev 412004)
@@ -5,11 +5,11 @@
 pkgname=code
 pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
 pkgver=1.29.1
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://github.com/Microsoft/vscode'
 license=('MIT')
-depends=('electron' 'libsecret' 'libxkbfile' 'ripgrep')
+depends=('electron2' 'libsecret' 'libxkbfile' 'ripgrep')
 # 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"
@@ -19,7 +19,7 @@
         'code-liveshare.diff')
 sha512sums=('SKIP'
             '814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
-            '0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
+            '3cccafe4ba72efe5583c7afdae5099e8efd4c98a072fedc40209f6ec5070e71dfd37f53ed67fc0f093be21b7fc4cd114475ef1772cdb99c31d925bab6a7f6714'
             '3c4bf0942ba9f1ba33937cc08e87caa8d6c030b862f99b2bac9ce6665739dd6a5f5a255b617c3f27ffd49df35563efa32f2c1a6240f9e19f16356bb12edac891'
             '0bd10ca06dea22854e47fc45d833756ee8d7bf714c88f63feef44e0b0b5da052fba3c27d001865e3389f391cd7b888d92dc0ba44029fa5c736225da3cf2f9a46')
 
@@ -58,7 +58,7 @@
   patch -p1 < ../code-liveshare.diff
 
   # Build native modules for system electron
-  local _target=$(</usr/lib/electron/version)
+  local _target=$(</usr/lib/electron2/version)
   sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
 
   # Patch appdata and desktop file

Modified: code.sh
===================================================================
--- code.sh	2018-12-06 23:09:31 UTC (rev 412003)
+++ code.sh	2018-12-06 23:16:31 UTC (rev 412004)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
+ELECTRON_RUN_AS_NODE=1 exec electron2 /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"