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

[Nicola Squartini]

    Date: Thursday, March 4, 2021 @ 16:01:39
  Author: tensor5
Revision: 880369

upgpkg: apm 2.6.1-2

Use local npm (fix FS#69844).

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

----------------------+
 PKGBUILD             |    7 +------
 use-system-npm.patch |   10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-04 14:29:32 UTC (rev 880368)
+++ PKGBUILD	2021-03-04 16:01:39 UTC (rev 880369)
@@ -2,7 +2,7 @@
 
 pkgname=apm
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Atom package manager'
 arch=('x86_64')
 url='https://github.com/atom/apm'
@@ -16,12 +16,10 @@
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
         'apm.js'
         'no-scripts.patch'
-        'use-system-npm.patch'
         'git-utils.patch')
 sha512sums=('e4b29069b2106cc9d8179344fca4fc6032751e7b878c9302a4f4af7fcf28f638e9f0d38df4b206db85f23743a7bec0287093100fee3637ff8e771388cc44ffaf'
             'c02c18e00c378fc968cd593bfed3ff0636a2786fa9ef212547efc30c54576f55dc94ac503b827ec79283c5deb87a22a7046565d8c630d55ed20d0ad020f8a77f'
             'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6'
-            'de912b3da4f0433be1d960e849dbaf664b6b0d9366b9b8fb784e79f4d5ea35a24cc76c11c9f662b615a66b14ac92c1009d6b85e2c02395d87e27b15daaaa59b8'
             'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -36,9 +34,6 @@
   rm src/cli.coffee
   install -m755 "${srcdir}"/apm.js bin/apm
 
-  # Use system npm
-  patch -Np1 -i "${srcdir}"/use-system-npm.patch
-
   # Don't download binary Node
   patch -Np1 -i "${srcdir}"/no-scripts.patch
   rm BUNDLED_NODE_VERSION script/*

Deleted: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2021-03-04 14:29:32 UTC (rev 880368)
+++ use-system-npm.patch	2021-03-04 16:01:39 UTC (rev 880369)
@@ -1,10 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -39,7 +39,6 @@
-     "keytar": "^6.0.1",
-     "mv": "2.1.1",
-     "ncp": "~2.0.0",
--    "npm": "^6.14.9",
-     "open": "7.3.0",
-     "q": "~1.5.1",
-     "read": "~1.0.7",