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

[Nicola Squartini]

    Date: Friday, November 16, 2018 @ 22:46:42
  Author: tensor5
Revision: 408488

upgpkg: atom 1.32.2-2

Added:
  atom/trunk/electron-3.patch
Modified:
  atom/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 +++++++++-
 electron-3.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-16 22:18:53 UTC (rev 408487)
+++ PKGBUILD	2018-11-16 22:46:42 UTC (rev 408488)
@@ -2,7 +2,7 @@
 
 pkgname=atom
 pkgver=1.32.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
@@ -16,6 +16,7 @@
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
         'atom.js'
         'dugite-use-system-git.patch'
+        'electron-3.patch'
         'fix-atom-sh.patch'
         'fix-license-path.patch'
         'fix-restart.patch'
@@ -25,6 +26,7 @@
 sha256sums=('0a31fb6d6359d162667c2473c652f7fc376bca7522d901e11fa9fb3b89a8aa54'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
+            '328da3b30f4e20e56b38e588d9fe871c01bbbe69865a79e9586919564bdfa869'
             'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2'
             'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205'
             'cbac8d28e32a32760cd6b16d313e05e32af57bfdea1c248636e1b1ae74e4e92c'
@@ -40,11 +42,17 @@
   patch -Np1 -i "${srcdir}"/use-system-apm.patch
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
   patch -Np1 -i "${srcdir}"/fix-restart.patch
+
+  # Fix for Electron 3
+  patch -Np1 -i "${srcdir}"/electron-3.patch
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Fix for Electron 3
+  npm install --package-lock-only @atom/nsfw at 1.0.20 node-abi
+
   ATOM_RESOURCE_PATH="${PWD}" \
   npm_config_target=$(tail -c +2 /usr/lib/electron/version) \
   apm install

Added: electron-3.patch
===================================================================
--- electron-3.patch	                        (rev 0)
+++ electron-3.patch	2018-11-16 22:46:42 UTC (rev 408488)
@@ -0,0 +1,11 @@
+--- a/src/text-editor-component.js
++++ b/src/text-editor-component.js
+@@ -4433,7 +4433,7 @@
+ 
+     if (element) {
+       element.className = className || ''
+-      element.styleMap.forEach((value, key) => {
++      element.attributeStyleMap.forEach((value, key) => {
+         if (!style || style[key] == null) element.style[key] = ''
+       })
+       if (style) Object.assign(element.style, style)