[arch-commits] Commit in apm/repos/community-x86_64 (10 files)
Nicola Squartini
tensor5 at archlinux.org
Wed May 15 02:14:52 UTC 2019
Date: Wednesday, May 15, 2019 @ 02:14:51
Author: tensor5
Revision: 467249
archrelease: copy trunk to community-x86_64
Added:
apm/repos/community-x86_64/PKGBUILD
(from rev 467248, apm/trunk/PKGBUILD)
apm/repos/community-x86_64/apm.js
(from rev 467248, apm/trunk/apm.js)
apm/repos/community-x86_64/no-scripts.patch
(from rev 467248, apm/trunk/no-scripts.patch)
apm/repos/community-x86_64/python2.patch
(from rev 467248, apm/trunk/python2.patch)
apm/repos/community-x86_64/use-system-npm.patch
(from rev 467248, apm/trunk/use-system-npm.patch)
Deleted:
apm/repos/community-x86_64/PKGBUILD
apm/repos/community-x86_64/apm.js
apm/repos/community-x86_64/no-scripts.patch
apm/repos/community-x86_64/python2.patch
apm/repos/community-x86_64/use-system-npm.patch
----------------------+
PKGBUILD | 204 ++++++++++++++++++++++++-------------------------
apm.js | 26 +++---
no-scripts.patch | 32 +++----
python2.patch | 28 +++---
use-system-npm.patch | 53 ++++++++++--
5 files changed, 188 insertions(+), 155 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-15 02:13:51 UTC (rev 467248)
+++ PKGBUILD 2019-05-15 02:14:51 UTC (rev 467249)
@@ -1,102 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=apm
-pkgver=2.2.3
-pkgrel=1
-pkgdesc='Atom package manager'
-arch=('x86_64')
-url='https://github.com/atom/apm'
-license=('MIT')
-depends=('libsecret' 'nodejs>=10' 'npm' 'python2')
-makedepends=('git')
-provides=('nodejs-atom-package-manager')
-conflicts=('nodejs-atom-package-manager')
-replaces=('nodejs-atom-package-manager')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
- 'apm.js'
- 'no-scripts.patch'
- 'python2.patch'
- 'use-system-npm.patch')
-sha256sums=('24984b4ab4e44ad39996d451fad2ac214631cd7d694c6268761bc06dbddd10a3'
- '05702e86aa2287b553c230557c5f84ea54dd6ed3cc49763edba4239b0ab99373'
- '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
- '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
- 'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19')
-
-_apmdir='/usr/lib/node_modules/atom-package-manager'
-
-prepare() {
- rm -rf "${srcdir}"/apm-build
-
- cd apm-${pkgver}
-
- # Use custom launcher
- rm bin/apm{,.cmd} bin/npm{,.cmd}
- rm src/cli.coffee
- install -m755 "${srcdir}"/apm.js bin/apm
-
- # Use system npm and node-gyp
- 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/*
-
- # GYP needs Python2
- patch -Np1 -i "${srcdir}"/python2.patch
-}
-
-build() {
- cd apm-${pkgver}
-
- npm install coffee-script
- npx coffee -c --no-header -o lib src/*.coffee
- rm -r node_modules
- npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1)
-}
-
-package() {
- cp -r "${srcdir}"/apm-build/usr "${pkgdir}"
-
- cd "${pkgdir}"${_apmdir}
- install -m644 "${srcdir}"/apm-${pkgver}/README.md ./
-
- # Install license file
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \
- "${pkgdir}/usr/share/licenses/${pkgname}"
-
- # Remove occurrences of ${srcdir}
- find "${pkgdir}" -name "package.json" \
- -exec sed -e "s|${srcdir}/apm-build||" \
- -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \
- -i '{}' \;
-
- # Remove useless stuff
- find "${pkgdir}"/usr/lib \
- -name ".*" -prune -exec rm -r '{}' \; \
- -or -name "*.a" -exec rm '{}' \; \
- -or -name "*.bat" -exec rm '{}' \; \
- -or -name "*.mk" -exec rm '{}' \; \
- -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \
- -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \
- -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \
- -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \
- -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \
- -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \
- -or -name "appveyor.yml" -exec rm '{}' \; \
- -or -name "benchmark" -prune -exec rm -r '{}' \; \
- -or -name "binding.Makefile" -exec rm '{}' \; \
- -or -name "config.gypi" -exec rm '{}' \; \
- -or -name "deps" -prune -exec rm -r '{}' \; \
- -or -name "doc" -prune -exec rm -r '{}' \; \
- -or -name "html" -prune -exec rm -r '{}' \; \
- -or -name "Makefile" -exec rm '{}' \; \
- -or -name "man" -prune -exec rm -r '{}' \; \
- -or -name "obj.target" -prune -exec rm -r '{}' \; \
- -or -name "samples" -prune -exec rm -r '{}' \; \
- -or -name "scripts" -prune -exec rm -r '{}' \; \
- -or -name "test" -prune -exec rm -r '{}' \; \
- -or -name "tests" -prune -exec rm -r '{}' \;
-}
Copied: apm/repos/community-x86_64/PKGBUILD (from rev 467248, apm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-15 02:14:51 UTC (rev 467249)
@@ -0,0 +1,102 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=apm
+pkgver=2.2.3
+pkgrel=2
+pkgdesc='Atom package manager'
+arch=('x86_64')
+url='https://github.com/atom/apm'
+license=('MIT')
+depends=('libsecret' 'nodejs>=10' 'npm' 'python2')
+makedepends=('git')
+provides=('nodejs-atom-package-manager')
+conflicts=('nodejs-atom-package-manager')
+replaces=('nodejs-atom-package-manager')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
+ 'apm.js'
+ 'no-scripts.patch'
+ 'python2.patch'
+ 'use-system-npm.patch')
+sha256sums=('24984b4ab4e44ad39996d451fad2ac214631cd7d694c6268761bc06dbddd10a3'
+ '05702e86aa2287b553c230557c5f84ea54dd6ed3cc49763edba4239b0ab99373'
+ '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
+ '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
+ 'b5060321f0c2d391efb742393dc0af564977ded5fc30b78d9fd895e384f6ef6d')
+
+_apmdir='/usr/lib/node_modules/atom-package-manager'
+
+prepare() {
+ rm -rf "${srcdir}"/apm-build
+
+ cd apm-${pkgver}
+
+ # Use custom launcher
+ rm bin/apm{,.cmd} bin/npm{,.cmd}
+ rm src/cli.coffee
+ install -m755 "${srcdir}"/apm.js bin/apm
+
+ # Use system npm and node-gyp
+ 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/*
+
+ # GYP needs Python2
+ patch -Np1 -i "${srcdir}"/python2.patch
+}
+
+build() {
+ cd apm-${pkgver}
+
+ npm install coffee-script
+ npx coffee -c --no-header -o lib src/*.coffee
+ rm -r node_modules
+ npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1)
+}
+
+package() {
+ cp -r "${srcdir}"/apm-build/usr "${pkgdir}"
+
+ cd "${pkgdir}"${_apmdir}
+ install -m644 "${srcdir}"/apm-${pkgver}/README.md ./
+
+ # Install license file
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \
+ "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Remove occurrences of ${srcdir}
+ find "${pkgdir}" -name "package.json" \
+ -exec sed -e "s|${srcdir}/apm-build||" \
+ -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \
+ -i '{}' \;
+
+ # Remove useless stuff
+ find "${pkgdir}"/usr/lib \
+ -name ".*" -prune -exec rm -r '{}' \; \
+ -or -name "*.a" -exec rm '{}' \; \
+ -or -name "*.bat" -exec rm '{}' \; \
+ -or -name "*.mk" -exec rm '{}' \; \
+ -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \
+ -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \
+ -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \
+ -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \
+ -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \
+ -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \
+ -or -name "appveyor.yml" -exec rm '{}' \; \
+ -or -name "benchmark" -prune -exec rm -r '{}' \; \
+ -or -name "binding.Makefile" -exec rm '{}' \; \
+ -or -name "config.gypi" -exec rm '{}' \; \
+ -or -name "deps" -prune -exec rm -r '{}' \; \
+ -or -name "doc" -prune -exec rm -r '{}' \; \
+ -or -name "html" -prune -exec rm -r '{}' \; \
+ -or -name "Makefile" -exec rm '{}' \; \
+ -or -name "man" -prune -exec rm -r '{}' \; \
+ -or -name "obj.target" -prune -exec rm -r '{}' \; \
+ -or -name "samples" -prune -exec rm -r '{}' \; \
+ -or -name "scripts" -prune -exec rm -r '{}' \; \
+ -or -name "test" -prune -exec rm -r '{}' \; \
+ -or -name "tests" -prune -exec rm -r '{}' \;
+}
Deleted: apm.js
===================================================================
--- apm.js 2019-05-15 02:13:51 UTC (rev 467248)
+++ apm.js 2019-05-15 02:14:51 UTC (rev 467249)
@@ -1,13 +0,0 @@
-#!/usr/bin/node
-
-"use strict";
-
-process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || "/usr/lib/atom";
-
-process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron/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));
-});
Copied: apm/repos/community-x86_64/apm.js (from rev 467248, apm/trunk/apm.js)
===================================================================
--- apm.js (rev 0)
+++ apm.js 2019-05-15 02:14:51 UTC (rev 467249)
@@ -0,0 +1,13 @@
+#!/usr/bin/node
+
+"use strict";
+
+process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || "/usr/lib/atom";
+
+process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron/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));
+});
Deleted: no-scripts.patch
===================================================================
--- no-scripts.patch 2019-05-15 02:13:51 UTC (rev 467248)
+++ no-scripts.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -1,16 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -14,13 +14,6 @@
- "bin": {
- "apm": "./bin/apm"
- },
-- "scripts": {
-- "build": "node script/check-version.js && grunt",
-- "prepublish": "grunt prepublish",
-- "install": "node script/postinstall.js",
-- "test": "node script/check-version.js && grunt test",
-- "check-version": "node version.js"
-- },
- "dependencies": {
- "@atom/plist": "0.4.4",
- "asar-require": "0.3.0",
Copied: apm/repos/community-x86_64/no-scripts.patch (from rev 467248, apm/trunk/no-scripts.patch)
===================================================================
--- no-scripts.patch (rev 0)
+++ no-scripts.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -0,0 +1,16 @@
+--- a/package.json
++++ b/package.json
+@@ -14,13 +14,6 @@
+ "bin": {
+ "apm": "./bin/apm"
+ },
+- "scripts": {
+- "build": "node script/check-version.js && grunt",
+- "prepublish": "grunt prepublish",
+- "install": "node script/postinstall.js",
+- "test": "node script/check-version.js && grunt test",
+- "check-version": "node version.js"
+- },
+ "dependencies": {
+ "@atom/plist": "0.4.4",
+ "asar-require": "0.3.0",
Deleted: python2.patch
===================================================================
--- python2.patch 2019-05-15 02:13:51 UTC (rev 467248)
+++ python2.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -1,14 +0,0 @@
---- a/bin/python-interceptor.sh
-+++ b/bin/python-interceptor.sh
-@@ -34,9 +34,9 @@
- ARGS+=("--format=safemake.py")
- fi
-
-- exec python "${ARGS[@]}"
-+ exec python2 "${ARGS[@]}"
- ;;
- *)
-- exec python "$@"
-+ exec python2 "$@"
- ;;
- esac
Copied: apm/repos/community-x86_64/python2.patch (from rev 467248, apm/trunk/python2.patch)
===================================================================
--- python2.patch (rev 0)
+++ python2.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -0,0 +1,14 @@
+--- a/bin/python-interceptor.sh
++++ b/bin/python-interceptor.sh
+@@ -34,9 +34,9 @@
+ ARGS+=("--format=safemake.py")
+ fi
+
+- exec python "${ARGS[@]}"
++ exec python2 "${ARGS[@]}"
+ ;;
+ *)
+- exec python "$@"
++ exec python2 "$@"
+ ;;
+ esac
Deleted: use-system-npm.patch
===================================================================
--- use-system-npm.patch 2019-05-15 02:13:51 UTC (rev 467248)
+++ use-system-npm.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -1,10 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -33,7 +33,6 @@
- "keytar": "^4.0",
- "mv": "2.0.0",
- "ncp": "~0.5.1",
-- "npm": "6.2.0",
- "open": "0.0.5",
- "q": "~0.9.7",
- "read": "~1.0.5",
Copied: apm/repos/community-x86_64/use-system-npm.patch (from rev 467248, apm/trunk/use-system-npm.patch)
===================================================================
--- use-system-npm.patch (rev 0)
+++ use-system-npm.patch 2019-05-15 02:14:51 UTC (rev 467249)
@@ -0,0 +1,43 @@
+--- a/package.json
++++ b/package.json
+@@ -33,7 +33,6 @@
+ "keytar": "^4.0",
+ "mv": "2.0.0",
+ "ncp": "~0.5.1",
+- "npm": "6.2.0",
+ "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()
More information about the arch-commits
mailing list