[arch-commits] Commit in npm/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, December 23, 2019 @ 22:42:34
  Author: felixonmars
Revision: 539639

upgpkg: npm 6.13.4-1

Modified:
  npm/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-23 22:37:58 UTC (rev 539638)
+++ PKGBUILD	2019-12-23 22:42:34 UTC (rev 539639)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=npm
-pkgver=6.12.1
+pkgver=6.13.4
 pkgrel=1
 pkgdesc='A package manager for javascript'
 arch=('any')
@@ -8,10 +8,13 @@
 url='https://www.npmjs.com/'
 license=('custom:Artistic')
 depends=('nodejs' 'node-gyp' 'semver')
-makedepends=('procps-ng' 'marked-man')
+# libgl: TODO
+# libvips: for sharp (doc build)
+# libxi: for cwebp (doc build)
+makedepends=('libgl' 'libvips' 'libxi' 'marked' 'marked-man' 'procps-ng' 'python')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/cli/archive/v$pkgver.tar.gz")
-sha512sums=('781ad125eebf426714a050eb0d3332c2a22041380c6b5691b6781f49f8324ce8ace7c6040b34ed8132d084da74cb6dfe69a9ef0ccd1c554d86864d13a20f618c')
+sha512sums=('0b7b591bb73ea0ca25a5675e6c01c6289bdc85fd22cea399d0b7a0e428bda838d1f4ac279ee674de6ed7fcd1f3d2e91a3c8bd023ea8eaef211b8f4cee7ec718a')
 
 prepare() {
   cd cli-$pkgver
@@ -18,12 +21,22 @@
   mkdir -p node_modules/.bin
   ln -sf /usr/bin/marked{,-man} node_modules/.bin/
 
+  # Use local marked/marked-man
+  sed -i 's|node bin/npm-cli.js install marked|true |' Makefile
+
+  # Don't build twice
+  sed -i 's/install: all/install:/' Makefile
+
   mkdir -p man/man1
+
+  # Fix nodejs 13 compatibility
+  sed -i '/gatsby/ s/\^/>=/' docs/package.json
+  rm docs/package-lock.json
 }
 
 build() {
   cd cli-$pkgver
-  make
+  NODE_PATH=/usr/lib/node_modules make
 }
 
 package() {