[arch-commits] Commit in atom/trunk (3 files)

[Nicola Squartini]

    Date: Thursday, February 22, 2018 @ 17:14:58
  Author: tensor5
Revision: 297085

upgpkg: atom 1.24.0-2

Added:
  atom/trunk/fix-node8.patch
Modified:
  atom/trunk/PKGBUILD
  atom/trunk/use-system-electron.patch

---------------------------+
 PKGBUILD                  |    7 +++++--
 fix-node8.patch           |   11 +++++++++++
 use-system-electron.patch |   28 +++++++++++++++++-----------
 3 files changed, 33 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-22 16:27:56 UTC (rev 297084)
+++ PKGBUILD	2018-02-22 17:14:58 UTC (rev 297085)
@@ -3,7 +3,7 @@
 
 pkgname=atom
 pkgver=1.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
@@ -18,6 +18,7 @@
         'dugite-use-system-git.patch'
         'fix-atom-sh.patch'
         'fix-license-path.patch'
+        'fix-node8.patch'
         'fix-restart.patch'
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
@@ -26,10 +27,11 @@
             'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
             '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
             'ef8cc9f8c6a3e0359a19b876653c4d6a0ef1224c2d4e06f3e5d535c772292f4f'
+            'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86'
             '34625e26f1089a068582bd43a9a3755b3f5186b90dcc097b519def8f701d9f3a'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
-            'bc0ee7f91208b41399d43c6f5660dc9bc056c68c494eebece9dbd300278e5a7b')
+            '3e16f307de4f4bbe247d0e3aaba4abcd74b8d2668898613432dd0fee8f37ce95')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,6 +40,7 @@
   patch -Np1 -i "${srcdir}"/use-system-electron.patch
   patch -Np1 -i "${srcdir}"/use-system-apm.patch
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
+  patch -Np1 -i "${srcdir}"/fix-node8.patch
   patch -Np1 -i "${srcdir}"/fix-restart.patch
 }
 

Added: fix-node8.patch
===================================================================
--- fix-node8.patch	                        (rev 0)
+++ fix-node8.patch	2018-02-22 17:14:58 UTC (rev 297085)
@@ -0,0 +1,11 @@
+--- a/src/module-cache.coffee
++++ b/src/module-cache.coffee
+@@ -189,7 +189,7 @@ resolveModulePath = (relativePath, parentModule) ->
+   return unless candidates?
+ 
+   for version, resolvedPath of candidates
+-    if Module._cache.hasOwnProperty(resolvedPath) or isCorePath(resolvedPath)
++    if Boolean(Module._cache[resolvedPath]) or isCorePath(resolvedPath)
+       return resolvedPath if satisfies(version, range)
+ 
+   return

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2018-02-22 16:27:56 UTC (rev 297084)
+++ use-system-electron.patch	2018-02-22 17:14:58 UTC (rev 297085)
@@ -21,7 +21,7 @@
  // Needed so we can require src/module-cache.coffee during generateModuleCache
  require('coffee-script/register')
  require('colors')
-@@ -26,7 +22,6 @@
+@@ -26,7 +22,6 @@ const argv = yargs
    .wrap(yargs.terminalWidth())
    .argv
  
@@ -29,8 +29,11 @@
  const cleanOutputDirectory = require('./lib/clean-output-directory')
  const codeSignOnMac = require('./lib/code-sign-on-mac')
  const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -39,7 +34,6 @@
- const generateAPIDocs = require('./lib/generate-api-docs')
+@@ -36,10 +31,8 @@ const createDebianPackage = require('./lib/create-debian-package')
+ const createRpmPackage = require('./lib/create-rpm-package')
+ const createWindowsInstaller = require('./lib/create-windows-installer')
+ const dumpSymbols = require('./lib/dump-symbols')
+-const generateAPIDocs = require('./lib/generate-api-docs')
  const generateMetadata = require('./lib/generate-metadata')
  const generateModuleCache = require('./lib/generate-module-cache')
 -const generateStartupSnapshot = require('./lib/generate-startup-snapshot')
@@ -37,7 +40,7 @@
  const installApplication = require('./lib/install-application')
  const packageApplication = require('./lib/package-application')
  const prebuildLessCache = require('./lib/prebuild-less-cache')
-@@ -58,7 +52,6 @@
+@@ -58,7 +51,6 @@ const CONFIG = require('./config')
  let binariesPromise = Promise.resolve()
  
  if (!argv.existingBinaries) {
@@ -45,8 +48,11 @@
    cleanOutputDirectory()
    copyAssets()
    transpilePackagesWithCustomTranspilerPaths()
-@@ -72,63 +65,3 @@
-   generateAPIDocs()
+@@ -69,66 +61,5 @@ if (!argv.existingBinaries) {
+   generateModuleCache()
+   prebuildLessCache()
+   generateMetadata()
+-  generateAPIDocs()
    binariesPromise = dumpSymbols()
  }
 -
@@ -123,7 +129,7 @@
      "fs-admin": "^0.1.5",
 --- a/src/compile-cache.js
 +++ b/src/compile-cache.js
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ exports.install = function (resourcesPath, nodeRequire) {
        return {
          column,
          line: row,
@@ -134,7 +140,7 @@
      }
 --- a/src/main-process/start.js
 +++ b/src/main-process/start.js
-@@ -85,5 +85,5 @@
+@@ -85,5 +85,5 @@ function handleStartupEventWithSquirrel () {
  function setupCompileCache () {
    const CompileCache = require('../compile-cache')
    CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
@@ -143,7 +149,7 @@
  }
 --- a/src/module-cache.coffee
 +++ b/src/module-cache.coffee
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ resolveModulePath = (relativePath, parentModule) ->
    return
  
  registerBuiltins = (devMode) ->
@@ -154,7 +160,7 @@
      cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
 --- a/src/package-manager.js
 +++ b/src/package-manager.js
-@@ -807,7 +807,7 @@
+@@ -807,7 +807,7 @@ module.exports = class PackageManager {
    }
  
    isBundledPackagePath (packagePath) {
@@ -165,7 +171,7 @@
  
 --- a/src/task-bootstrap.js
 +++ b/src/task-bootstrap.js
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,7 @@ const [compileCachePath, taskPath] = process.argv.slice(2)
  
  const CompileCache = require('./compile-cache')
  CompileCache.setCacheDirectory(compileCachePath)