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

[Nicola Squartini]

    Date: Monday, October 8, 2018 @ 11:22:13
  Author: tensor5
Revision: 391088

upgpkg: atom 1.31.2-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/fix-restart.patch
  atom/trunk/use-system-apm.patch
  atom/trunk/use-system-electron.patch

---------------------------+
 PKGBUILD                  |   17 +++++++----------
 fix-restart.patch         |    2 +-
 use-system-apm.patch      |    6 +++---
 use-system-electron.patch |   24 ++++++++++++------------
 4 files changed, 23 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-08 10:53:39 UTC (rev 391087)
+++ PKGBUILD	2018-10-08 11:22:13 UTC (rev 391088)
@@ -1,7 +1,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.30.0
+pkgver=1.31.2
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
@@ -22,15 +22,15 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('ebc4ef0922307f2c4dfd69c6cd2cb4f4c8f1dc7c00a55253437b7f893d2d94cd'
+sha256sums=('baff1b23e03c638584d01817bda15503e66eff1c231c3952670c94b345588628'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
             'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2'
             'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205'
-            'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933'
+            '1f48c84f30ffefaef7235d8231af7357b801d66de9f09921d0ee0dd5849595ca'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
-            '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
-            '79ae5cf80af9a4aa4ff84cad3786e8cdf3eef25e967919c84374d490f9c7f884')
+            '32e27c6245237a794b15eaf7dbfb81196455865af8ed9157aca763ed21a2fef3'
+            'a6e34b5f35183fb5f12000fc9f9948cb6dff0a50909f65c8bc87b149d3d81b00')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -45,10 +45,8 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  export ATOM_RESOURCE_PATH="$srcdir/atom-$pkgver"
-  # If unset, ~/.atom/.node-gyp/.atom/.npm is used
-  export NPM_CONFIG_CACHE="${HOME}/.atom/.npm"
-  apm clean
+  ATOM_RESOURCE_PATH="${PWD}" \
+  npm_config_target=$(tail -c +2 /usr/lib/electron/version) \
   apm install
 
   # Use system ctags
@@ -96,7 +94,6 @@
   node -e "require('./script/lib/get-license-text')().then((licenseText) => require('fs').writeFileSync('${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md', licenseText))"
 
   # Remove useless stuff
-  rm "${pkgdir}"/usr/lib/atom/node_modules/.bin/pegjs
   find "${pkgdir}"/usr/lib/atom/node_modules \
       -name "*.a" -exec rm '{}' \; \
       -or -name "*.bat" -exec rm '{}' \; \

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2018-10-08 10:53:39 UTC (rev 391087)
+++ fix-restart.patch	2018-10-08 11:22:13 UTC (rev 391088)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -1349,7 +1349,7 @@
+@@ -1350,7 +1350,7 @@
    }
  
    restart () {

Modified: use-system-apm.patch
===================================================================
--- use-system-apm.patch	2018-10-08 10:53:39 UTC (rev 391087)
+++ use-system-apm.patch	2018-10-08 11:22:13 UTC (rev 391088)
@@ -10,12 +10,12 @@
    childProcess.execFileSync(
 -    CONFIG.getApmBinPath(),
 +    'apm',
-     ['--loglevel=error', 'install'],
-     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
+     ['--loglevel=error', ci ? 'ci' : 'install'],
+     {env: installEnv, cwd: packagePath, stdio: stdioOptions || 'inherit'}
    )
 --- a/src/package-manager.js
 +++ b/src/package-manager.js
-@@ -166,13 +166,7 @@
+@@ -167,13 +167,7 @@
        return configPath || this.apmPath
      }
  

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2018-10-08 10:53:39 UTC (rev 391087)
+++ use-system-electron.patch	2018-10-08 11:22:13 UTC (rev 391088)
@@ -4,10 +4,10 @@
      "url": "https://github.com/atom/atom/issues"
    },
    "license": "MIT",
--  "electronVersion": "2.0.5",
+-  "electronVersion": "2.0.7",
    "dependencies": {
      "@atom/nsfw": "^1.0.18",
-     "@atom/watcher": "1.0.3",
+     "@atom/source-map-support": "^0.3.4",
 --- a/script/build
 +++ b/script/build
 @@ -2,10 +2,6 @@
@@ -21,23 +21,23 @@
  // Needed so we can require src/module-cache.coffee during generateModuleCache
  require('coffee-script/register')
  require('colors')
-@@ -27,7 +23,6 @@
+@@ -28,7 +24,6 @@
    .wrap(yargs.terminalWidth())
    .argv
  
 -const checkChromedriverVersion = require('./lib/check-chromedriver-version')
  const cleanOutputDirectory = require('./lib/clean-output-directory')
- const cleanPackageLock = require('./lib/clean-package-lock')
  const codeSignOnMac = require('./lib/code-sign-on-mac')
-@@ -61,7 +56,6 @@
+ const codeSignOnWindows = require('./lib/code-sign-on-windows')
+@@ -60,7 +55,6 @@
+ let binariesPromise = Promise.resolve()
  
  if (!argv.existingBinaries) {
-   cleanPackageLock()
 -  checkChromedriverVersion()
    cleanOutputDirectory()
    copyAssets()
    transpilePackagesWithCustomTranspilerPaths()
-@@ -80,67 +74,5 @@
+@@ -79,67 +73,5 @@
  
  if (!argv.generateApiDocs) {
    binariesPromise
@@ -107,7 +107,7 @@
  }
 --- a/script/lib/generate-startup-snapshot.js
 +++ b/script/lib/generate-startup-snapshot.js
-@@ -79,7 +79,7 @@
+@@ -80,7 +80,7 @@
      } else if (process.platform === 'win32') {
        nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')
      } else {
@@ -116,7 +116,7 @@
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,
-@@ -87,6 +87,7 @@
+@@ -88,6 +88,7 @@
        {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})}
      )
  
@@ -124,7 +124,7 @@
      const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin')
      console.log(`Generating startup blob at "${generatedStartupBlobPath}"`)
      childProcess.execFileSync(
-@@ -104,5 +105,6 @@
+@@ -105,5 +106,6 @@
      console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`)
      fs.unlinkSync(startupBlobDestinationPath)
      fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath)
@@ -156,7 +156,7 @@
      }
 --- a/src/main-process/start.js
 +++ b/src/main-process/start.js
-@@ -104,7 +104,7 @@ function handleStartupEventWithSquirrel () {
+@@ -107,7 +107,7 @@ function handleStartupEventWithSquirrel () {
  function setupCompileCache () {
    const CompileCache = require('../compile-cache')
    CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
@@ -178,7 +178,7 @@
      cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
 --- a/src/package-manager.js
 +++ b/src/package-manager.js
-@@ -807,7 +807,7 @@ module.exports = class PackageManager {
+@@ -808,7 +808,7 @@ module.exports = class PackageManager {
    }
  
    isBundledPackagePath (packagePath) {