[arch-commits] Commit in atom/trunk (PKGBUILD atom.js use-system-electron.patch)

[Nicola Squartini]

    Date: Saturday, June 22, 2019 @ 10:22:07
  Author: tensor5
Revision: 482753

upgpkg: atom 1.38.2-2

Make atom depend on electron4.

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/atom.js
  atom/trunk/use-system-electron.patch

---------------------------+
 PKGBUILD                  |   12 ++++++------
 atom.js                   |    2 +-
 use-system-electron.patch |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 10:02:13 UTC (rev 482752)
+++ PKGBUILD	2019-06-22 10:22:07 UTC (rev 482753)
@@ -2,12 +2,12 @@
 
 pkgname=atom
 pkgver=1.38.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
 license=('MIT' 'custom')
-depends=('apm' 'electron' 'libxkbfile')
+depends=('apm' 'electron4' 'libxkbfile')
 makedepends=('git' 'npm')
 optdepends=('ctags: symbol indexing support'
             'git: Git and GitHub integration')
@@ -26,7 +26,7 @@
         'use-system-apm.patch'
         'use-system-electron.patch')
 sha256sums=('b78c83975d9626752e05b14a27e5ad1bba623e887082e1c6f056902fd3fa7207'
-            'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
+            'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
             '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f'
             'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
@@ -36,7 +36,7 @@
             '85612ba035047b8599692ce458b903ef2204995e102b3ff47dc05923d6c2e7d8'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806'
-            '4ff7d60aacad1618015532ba2fec60d519213a8c6acaa370e0ccbc02718362b3')
+            'e8f4c7514f4d20a05cf27e21aa8ace9294fa8ad45f8ced15361106f4aad708b9')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,7 +58,7 @@
 
   ATOM_RESOURCE_PATH="${PWD}" \
   npm_config_build_from_source=true \
-  npm_config_target=$(< /usr/lib/electron/version) \
+  npm_config_target=$(< /usr/lib/electron4/version) \
   apm install
 
   # Use system ctags
@@ -76,7 +76,7 @@
   cd script
   npm install
   # Set ELECTRON_VERSION (see use-system-electron.patch)
-  env ELECTRON_VERSION=$(< /usr/lib/electron/version) ./build --no-bootstrap
+  env ELECTRON_VERSION=$(< /usr/lib/electron4/version) ./build --no-bootstrap
 }
 
 package() {

Modified: atom.js
===================================================================
--- atom.js	2019-06-22 10:02:13 UTC (rev 482752)
+++ atom.js	2019-06-22 10:22:07 UTC (rev 482753)
@@ -1,4 +1,4 @@
-#!/usr/bin/electron
+#!/usr/bin/electron4
 
 const name = "atom";
 

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2019-06-22 10:02:13 UTC (rev 482752)
+++ use-system-electron.patch	2019-06-22 10:22:07 UTC (rev 482753)
@@ -107,7 +107,7 @@
        nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')
      } else {
 -      nodeBundledInElectronPath = path.join(packagedAppPath, 'atom')
-+      nodeBundledInElectronPath = 'electron'
++      nodeBundledInElectronPath = 'electron4'
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,