Date: Saturday, March 31, 2018 @ 04:22:37 Author: tensor5 Revision: 313588
upgpkg: apm 1.19.0-2 Use stand-alone node-gyp package. Modified: apm/trunk/PKGBUILD apm/trunk/use-system-npm.patch ----------------------+ PKGBUILD | 6 +++--- use-system-npm.patch | 22 ---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-30 21:24:20 UTC (rev 313587) +++ PKGBUILD 2018-03-31 04:22:37 UTC (rev 313588) @@ -3,7 +3,7 @@ pkgname=apm pkgver=1.19.0 -pkgrel=1 +pkgrel=2 pkgdesc='Atom package manager' arch=('x86_64') url='https://github.com/atom/apm' @@ -23,7 +23,7 @@ '7ef40058bb50189729a541f8e74191336f9652f12e70118e8b24c207e42f00c8f548d408759f261d8b0f2f67f7296e38d771694e45570102e28be1e6b9788d6c' 'da2e2c6b336b87371541ef159201f6942c606f7c8b212f1a610a8605bb08ddc97ed1ade7f1c02339c40c40f22d8a7d37b1686fb5c7105a775fa85ff6048162dc' '2fedcfc04c03059429c231c5bbd3d5e4b32a30ea9d341c3e27dcbba0deee1e4c8d27d993c59ee96aebf0a0c930b7cc55177e3600c18349dd2b91ebac7bd96632' - 'b5000006cf81d1664db4e520f7835d7be0b794e843bc2d12c9339e1f88436722c41762be633b6157a76832c74525a11b4e58e2007e68d2a7217f533996fdf028') + 'f07c0bc1d31d8b6d237621cde024ebf538901fd7ea61801a7c50b5be84e2adf9da72eccc68d7bea0d8b0193d750ebde7de30a572f2e286194cb5c4f6f0d2a3f3') _apmdir='/usr/lib/node_modules/atom-package-manager' @@ -37,7 +37,7 @@ rm src/cli.coffee install -m755 "${srcdir}"/apm.js bin/apm - # Use system npm + # Use system npm and node-gyp patch -Np1 -i "${srcdir}"/use-system-npm.patch # Don't download binary Node Modified: use-system-npm.patch =================================================================== --- use-system-npm.patch 2018-03-30 21:24:20 UTC (rev 313587) +++ use-system-npm.patch 2018-03-31 04:22:37 UTC (rev 313588) @@ -9,25 +9,3 @@ "open": "0.0.4", "plist": "git+https://github.com/nathansobo/node-plist.git", "q": "~0.9.7", ---- a/src/dedupe.coffee -+++ b/src/dedupe.coffee -@@ -17,7 +17,7 @@ - @atomPackagesDirectory = path.join(@atomDirectory, 'packages') - @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp') - @atomNpmPath = require.resolve('npm/bin/npm-cli') -- @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp') -+ @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - - parseOptions: (argv) -> - options = yargs(argv).wrap(100) ---- a/src/install.coffee -+++ b/src/install.coffee -@@ -84,7 +84,7 @@ - opts = {env, cwd: @atomDirectory} - opts.streaming = true if @verbose - -- atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp') -+ atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') -> - if code is 0 - callback()