[arch-commits] Commit in apm/trunk (PKGBUILD use-system-npm.patch)

[Nicola Squartini]

    Date: Wednesday, June 19, 2019 @ 02:51:45
  Author: tensor5
Revision: 482286

upgpkg: apm 2.3.1-1

Modified:
  apm/trunk/PKGBUILD
  apm/trunk/use-system-npm.patch

----------------------+
 PKGBUILD             |   12 +++++++-----
 use-system-npm.patch |   33 ---------------------------------
 2 files changed, 7 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-19 02:03:31 UTC (rev 482285)
+++ PKGBUILD	2019-06-19 02:51:45 UTC (rev 482286)
@@ -1,8 +1,8 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=apm
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc='Atom package manager'
 arch=('x86_64')
 url='https://github.com/atom/apm'
@@ -18,11 +18,11 @@
         'no-scripts.patch'
         'python2.patch'
         'use-system-npm.patch')
-sha256sums=('24984b4ab4e44ad39996d451fad2ac214631cd7d694c6268761bc06dbddd10a3'
+sha256sums=('39c684a34caf1d01b2efbaec24101c970ad3eb1b2327da573f3c3f9db0d4d527'
             '05702e86aa2287b553c230557c5f84ea54dd6ed3cc49763edba4239b0ab99373'
             '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
             '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
-            'b5060321f0c2d391efb742393dc0af564977ded5fc30b78d9fd895e384f6ef6d')
+            'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
 
@@ -36,7 +36,9 @@
   rm src/cli.coffee
   install -m755 "${srcdir}"/apm.js bin/apm
 
-  # Use system npm and node-gyp
+  # Use system npm
+  tr -d '\015' < package.json > package.json.new  # CRLF to LF
+  mv package.json.new package.json
   patch -Np1 -i "${srcdir}"/use-system-npm.patch
 
   # Don't download binary Node

Modified: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2019-06-19 02:03:31 UTC (rev 482285)
+++ use-system-npm.patch	2019-06-19 02:51:45 UTC (rev 482286)
@@ -8,36 +8,3 @@
      "open": "0.0.5",
      "q": "~0.9.7",
      "read": "~1.0.5",
---- a/src/ci.coffee
-+++ b/src/ci.coffee
-@@ -16,7 +16,7 @@
-     @atomDirectory = config.getAtomDirectory()
-     @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp')
-     @atomNpmPath = require.resolve('npm/bin/npm-cli')
--    @atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
-+    @atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp')
- 
-   parseOptions: (argv) ->
-     options = yargs(argv).wrap(100)
---- a/src/dedupe.coffee
-+++ b/src/dedupe.coffee
-@@ -18,7 +18,7 @@
-     @atomPackagesDirectory = path.join(@atomDirectory, 'packages')
-     @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp')
-     @atomNpmPath = require.resolve('npm/bin/npm-cli')
--    @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
-+    @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp')
- 
-   parseOptions: (argv) ->
-     options = yargs(argv).wrap(100)
---- a/src/install.coffee
-+++ b/src/install.coffee
-@@ -83,7 +83,7 @@
-     opts = {env, cwd: @atomDirectory}
-     opts.streaming = true if @verbose
- 
--    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
-+    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp')
-     @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') ->
-       if code is 0
-         callback()