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

[Nicola Squartini]

    Date: Saturday, May 23, 2020 @ 04:53:03
  Author: tensor5
Revision: 631834

upgpkg: atom 1.47.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 04:20:37 UTC (rev 631833)
+++ PKGBUILD	2020-05-23 04:53:03 UTC (rev 631834)
@@ -1,14 +1,14 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.46.0
-_commit=c1fea480e3f4f9c615e23c7da221deb9d3196005
+pkgver=1.47.0
+_commit=eb1ec862273c68ebcf281c8b21d60c8336f046a4
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
 license=('MIT' 'custom')
-depends=('apm' 'electron4' 'libxkbfile' 'ripgrep')
+depends=('apm' 'electron5' 'libxkbfile' 'ripgrep')
 makedepends=('git' 'npm')
 optdepends=('ctags: symbol indexing support'
             'git: Git and GitHub integration')
@@ -27,7 +27,7 @@
         'use-system-apm.patch'
         'use-system-electron.patch')
 sha256sums=('SKIP'
-            'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
+            '6218ecf9a767e80f70a4b07abaefcf63a3d615200ff27b2dbc7bb36eacd8e87f'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
             'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
             '2894cce31935d45291c5fe4c625473bb83fc51e1b899f162aa6b419491c7ace1'
@@ -37,7 +37,7 @@
             'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4'
-            '5a6854cd89e5be446c73df59b1cf4048fc835b3b4d87f819779ef68ed89fa2db')
+            'a01a3237b3967b070e41a6bf3a4c664fbf6125559ffd3f84e43c81d77fa25b45')
 
 prepare() {
   cd ${pkgname}
@@ -56,7 +56,7 @@
 
   ATOM_RESOURCE_PATH="${PWD}" \
   npm_config_build_from_source=true \
-  npm_config_target=$(< /usr/lib/electron4/version) \
+  npm_config_target=$(< /usr/lib/electron5/version) \
   apm install
 
   # Use system ctags
@@ -78,22 +78,18 @@
   env \
     npm_config_disturl=https://electronjs.org/headers \
     npm_config_runtime=electron \
-    npm_config_target=$(< /usr/lib/electron4/version) \
+    npm_config_target=$(< /usr/lib/electron5/version) \
     node-gyp rebuild
   cd ../..
 
   cd script
-  # Hack to avoid using Node 12
-  env \
-    npm_config_disturl=https://electronjs.org/headers \
-    npm_config_runtime=electron \
-    npm_config_target=$(< /usr/lib/electron4/version) \
-    npm install
+  npm install
+  # Hack to avoid using Node > 12 (https://github.com/babel/babel/issues/11216)
   # Set ELECTRON_VERSION (see use-system-electron.patch)
   env \
     ELECTRON_RUN_AS_NODE=1 \
-    ELECTRON_VERSION=$(< /usr/lib/electron4/version) \
-    electron4 \
+    ELECTRON_VERSION=$(< /usr/lib/electron5/version) \
+    electron5 \
     build --no-bootstrap
 }
 

Modified: atom.js
===================================================================
--- atom.js	2020-05-23 04:20:37 UTC (rev 631833)
+++ atom.js	2020-05-23 04:53:03 UTC (rev 631834)
@@ -1,4 +1,4 @@
-#!/usr/bin/electron4
+#!/usr/bin/electron5
 
 const name = "atom";
 

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2020-05-23 04:20:37 UTC (rev 631833)
+++ use-system-electron.patch	2020-05-23 04:53:03 UTC (rev 631834)
@@ -4,7 +4,7 @@
      "url": "https://github.com/atom/atom/issues"
    },
    "license": "MIT",
--  "electronVersion": "4.2.7",
+-  "electronVersion": "5.0.13",
    "dependencies": {
      "@atom/nsfw": "1.0.26",
      "@atom/source-map-support": "^0.3.4",
@@ -111,7 +111,7 @@
  }
 --- a/script/lib/generate-startup-snapshot.js
 +++ b/script/lib/generate-startup-snapshot.js
-@@ -281,17 +281,14 @@
+@@ -286,17 +286,14 @@
          CONFIG.executableName
        );
      } else {
@@ -119,7 +119,7 @@
 -        packagedAppPath,
 -        CONFIG.executableName
 -      );
-+      nodeBundledInElectronPath = 'electron4';
++      nodeBundledInElectronPath = 'electron5';
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,
@@ -131,7 +131,7 @@
      console.log('Generating startup blob with mksnapshot');
      childProcess.spawnSync(process.execPath, [
        path.join(
-@@ -333,5 +330,6 @@
+@@ -338,5 +335,6 @@
          destinationPath
        );
      }
@@ -144,9 +144,9 @@
      "coffeelint": "1.15.7",
      "colors": "1.1.2",
      "donna": "1.0.16",
--    "electron-chromedriver": "^4.2.0",
-     "electron-link": "0.4.0",
--    "electron-mksnapshot": "^4.2.0",
+-    "electron-chromedriver": "^5.0.0",
+     "electron-link": "0.4.1",
+-    "electron-mksnapshot": "^5.0.0",
      "electron-packager": "12.2.0",
      "@atom/electron-winstaller": "0.0.1",
      "eslint": "^5.16.0",
@@ -161,18 +161,6 @@
          name: null
        };
      }
---- a/src/main-process/atom-window.js
-+++ b/src/main-process/atom-window.js
-@@ -47,7 +47,8 @@
-         // Disable the `auxclick` feature so that `click` events are triggered in
-         // response to a middle-click.
-         // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960)
--        disableBlinkFeatures: 'Auxclick'
-+        disableBlinkFeatures: 'Auxclick',
-+        nodeIntegration: true
-       }
-     };
- 
 --- a/src/module-cache.js
 +++ b/src/module-cache.js
 @@ -270,7 +270,7 @@