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

[Nicola Squartini]

    Date: Friday, May 8, 2020 @ 01:17:09
  Author: tensor5
Revision: 625509

upgpkg: apm 2.5.0-1

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

----------------------+
 PKGBUILD             |   16 ++++++++--------
 apm.js               |    2 --
 no-scripts.patch     |    2 +-
 use-system-npm.patch |    2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 01:01:07 UTC (rev 625508)
+++ PKGBUILD	2020-05-08 01:17:09 UTC (rev 625509)
@@ -1,8 +1,8 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=apm
-pkgver=2.4.5
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc='Atom package manager'
 arch=('x86_64')
 url='https://github.com/atom/apm'
@@ -13,16 +13,15 @@
 conflicts=('nodejs-atom-package-manager')
 replaces=('nodejs-atom-package-manager')
 options=(!emptydirs)
-_gitutils_tag=5.6.1
 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=('bf84e40be7491fac7bc7c7449e88d035549b526874371f4314ecfd80592e21459435d03c5d74d662551285161536982f30631d5add17f2929e9b3b8a4eb17d13'
-            'cc81dd506dc70c3c6b561e99e78eebbee45ce5543f2bd9dce6bc61949ecd876fc26c68b90b596c40ef839a4dc3c50e22f79c45d9137380925c2d06b5c2dec705'
-            '50646299ffff427b8233ac7fff7cf7abd46a8ffde121c166a8084d20d2e36b1bf3e35032eca339c9499ca844080c616fa52b0f4a13996305f2a4e41243bbf858'
-            'ef467bd6d3dbe3198fdd78f63489063e838c79103161dbfd611fe165e27a8c12c70792090ef3b3ee2f87cbe87c66114aec608e45b384895b4b88563b829c6d36'
+sha512sums=('34fdd9646d9ea67731aed7560547fb74fcb2f19a2ae69dd692834dffc7e0f2d7a9b1147f774e0f1bc9d491d57755f674073268dd599fa00e41673d2150883223'
+            '1f31778fca9540c7861ec13e15631f141997791e804582d1ba9e5c2a57c02ff62250b340f3166d103e7ed824fb05a993778f35e1a3575905b8582909adbfd159'
+            '4ad07dcf6fca3aabdd106f092d3a159712f52c4b161c54e7ac2c1d90598b98635dc86e8e97ec6f847392110c894b0b0ffb89be9f82164cd4a377a7dc53ac7b9a'
+            'd14c3465f068959580a8232b53740aa199e25b67e5c209b824ac1060aca4a6a12083cf2d495683abcc7faba4d4d1c4fe3276679c79c1754954b0eaf5e2d4eea2'
             'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -83,7 +82,8 @@
       -or -name "*.bat" -exec rm '{}' \; \
       -or -name "*.mk" -exec rm '{}' \; \
       -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \
-      -or -path "*/git-utils/src/*.{cc,h}" -prune -exec rm -r '{}' \; \
+      -or -path "*/git-utils/src/*.cc" -exec rm '{}' \; \
+      -or -path "*/git-utils/src/*.h" -exec rm '{}' \; \
       -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \
       -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \
       -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \

Modified: apm.js
===================================================================
--- apm.js	2020-05-08 01:01:07 UTC (rev 625508)
+++ apm.js	2020-05-08 01:17:09 UTC (rev 625509)
@@ -6,8 +6,6 @@
 
 process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron4/version", "utf8");
 
-process.env.npm_config_python = __dirname + "/python-interceptor.sh";
-
 require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) {
     process.exitCode = Number(Boolean(error));
 });

Modified: no-scripts.patch
===================================================================
--- no-scripts.patch	2020-05-08 01:01:07 UTC (rev 625508)
+++ no-scripts.patch	2020-05-08 01:17:09 UTC (rev 625509)
@@ -6,7 +6,7 @@
    },
 -  "scripts": {
 -    "build": "node script/check-version.js && grunt",
--    "prepublish": "grunt prepublish",
+-    "prepare": "grunt prepare",
 -    "install": "node script/postinstall.js",
 -    "test": "node script/check-version.js && grunt test",
 -    "check-version": "node version.js"

Modified: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2020-05-08 01:01:07 UTC (rev 625508)
+++ use-system-npm.patch	2020-05-08 01:17:09 UTC (rev 625509)
@@ -4,7 +4,7 @@
      "keytar": "^4.0",
      "mv": "2.0.0",
      "ncp": "~0.5.1",
--    "npm": "6.2.0",
+-    "npm": "^6.14.4",
      "open": "0.0.5",
      "q": "~0.9.7",
      "read": "~1.0.5",