[arch-commits] Commit in apm/repos (12 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Jun 3 13:46:43 UTC 2017
Date: Saturday, June 3, 2017 @ 13:46:42
Author: tensor5
Revision: 233751
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
apm/repos/community-testing-i686/
apm/repos/community-testing-i686/PKGBUILD
(from rev 233749, apm/trunk/PKGBUILD)
apm/repos/community-testing-i686/apm.js
(from rev 233749, apm/trunk/apm.js)
apm/repos/community-testing-i686/no-scripts.patch
(from rev 233749, apm/trunk/no-scripts.patch)
apm/repos/community-testing-i686/python2.patch
(from rev 233749, apm/trunk/python2.patch)
apm/repos/community-testing-i686/use-system-npm.patch
(from rev 233749, apm/trunk/use-system-npm.patch)
apm/repos/community-testing-x86_64/
apm/repos/community-testing-x86_64/PKGBUILD
(from rev 233750, apm/trunk/PKGBUILD)
apm/repos/community-testing-x86_64/apm.js
(from rev 233750, apm/trunk/apm.js)
apm/repos/community-testing-x86_64/no-scripts.patch
(from rev 233750, apm/trunk/no-scripts.patch)
apm/repos/community-testing-x86_64/python2.patch
(from rev 233750, apm/trunk/python2.patch)
apm/repos/community-testing-x86_64/use-system-npm.patch
(from rev 233750, apm/trunk/use-system-npm.patch)
-----------------------------------------------+
community-testing-i686/PKGBUILD | 101 ++++++++++++++++++++++++
community-testing-i686/apm.js | 16 +++
community-testing-i686/no-scripts.patch | 16 +++
community-testing-i686/python2.patch | 14 +++
community-testing-i686/use-system-npm.patch | 32 +++++++
community-testing-x86_64/PKGBUILD | 101 ++++++++++++++++++++++++
community-testing-x86_64/apm.js | 16 +++
community-testing-x86_64/no-scripts.patch | 16 +++
community-testing-x86_64/python2.patch | 14 +++
community-testing-x86_64/use-system-npm.patch | 32 +++++++
10 files changed, 358 insertions(+)
Copied: apm/repos/community-testing-i686/PKGBUILD (from rev 233749, apm/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=apm
+pkgver=1.18.2
+pkgrel=2
+pkgdesc='Atom package manager'
+arch=('i686' 'x86_64')
+url='https://github.com/atom/apm'
+license=('MIT')
+depends=('libsecret' 'npm' 'python2')
+makedepends=('coffee-script' '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=('0ce46c3d457818873409ab10958bd6b9920b23f22e9a866e3385b71a0abfac18'
+ '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752'
+ '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562'
+ '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
+ '67d4f8a3ff03f14b137e2c2ea82f5a0820fc6d82c86d3b8c8d3a1a6edd4307ed')
+
+_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
+ 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}
+
+ coffee -c --no-header -o lib src/*.coffee
+ npm install --user root -g --prefix="${srcdir}"/apm-build/usr
+}
+
+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-testing-i686/apm.js (from rev 233749, apm/trunk/apm.js)
===================================================================
--- community-testing-i686/apm.js (rev 0)
+++ community-testing-i686/apm.js 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,16 @@
+#!/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').trim().slice(1);
+
+process.env.PYTHON = __dirname + "/python-interceptor.sh";
+
+require('../lib/apm-cli.js').run(process.argv.slice(2), function (error) {
+ process.exitCode = +!!error;
+});
Copied: apm/repos/community-testing-i686/no-scripts.patch (from rev 233749, apm/trunk/no-scripts.patch)
===================================================================
--- community-testing-i686/no-scripts.patch (rev 0)
+++ community-testing-i686/no-scripts.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -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": {
+ "asar-require": "0.3.0",
+ "async": "~0.2.8",
Copied: apm/repos/community-testing-i686/python2.patch (from rev 233749, apm/trunk/python2.patch)
===================================================================
--- community-testing-i686/python2.patch (rev 0)
+++ community-testing-i686/python2.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -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
Copied: apm/repos/community-testing-i686/use-system-npm.patch (from rev 233749, apm/trunk/use-system-npm.patch)
===================================================================
--- community-testing-i686/use-system-npm.patch (rev 0)
+++ community-testing-i686/use-system-npm.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,32 @@
+--- a/package.json
++++ b/package.json
+@@ -32,7 +32,6 @@
+ "keytar": "^4.0",
+ "mv": "2.0.0",
+ "ncp": "~0.5.1",
+- "npm": "3.10.10",
+ "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()
Copied: apm/repos/community-testing-x86_64/PKGBUILD (from rev 233750, apm/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=apm
+pkgver=1.18.2
+pkgrel=2
+pkgdesc='Atom package manager'
+arch=('i686' 'x86_64')
+url='https://github.com/atom/apm'
+license=('MIT')
+depends=('libsecret' 'npm' 'python2')
+makedepends=('coffee-script' '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=('0ce46c3d457818873409ab10958bd6b9920b23f22e9a866e3385b71a0abfac18'
+ '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752'
+ '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562'
+ '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
+ '67d4f8a3ff03f14b137e2c2ea82f5a0820fc6d82c86d3b8c8d3a1a6edd4307ed')
+
+_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
+ 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}
+
+ coffee -c --no-header -o lib src/*.coffee
+ npm install --user root -g --prefix="${srcdir}"/apm-build/usr
+}
+
+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-testing-x86_64/apm.js (from rev 233750, apm/trunk/apm.js)
===================================================================
--- community-testing-x86_64/apm.js (rev 0)
+++ community-testing-x86_64/apm.js 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,16 @@
+#!/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').trim().slice(1);
+
+process.env.PYTHON = __dirname + "/python-interceptor.sh";
+
+require('../lib/apm-cli.js').run(process.argv.slice(2), function (error) {
+ process.exitCode = +!!error;
+});
Copied: apm/repos/community-testing-x86_64/no-scripts.patch (from rev 233750, apm/trunk/no-scripts.patch)
===================================================================
--- community-testing-x86_64/no-scripts.patch (rev 0)
+++ community-testing-x86_64/no-scripts.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -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": {
+ "asar-require": "0.3.0",
+ "async": "~0.2.8",
Copied: apm/repos/community-testing-x86_64/python2.patch (from rev 233750, apm/trunk/python2.patch)
===================================================================
--- community-testing-x86_64/python2.patch (rev 0)
+++ community-testing-x86_64/python2.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -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
Copied: apm/repos/community-testing-x86_64/use-system-npm.patch (from rev 233750, apm/trunk/use-system-npm.patch)
===================================================================
--- community-testing-x86_64/use-system-npm.patch (rev 0)
+++ community-testing-x86_64/use-system-npm.patch 2017-06-03 13:46:42 UTC (rev 233751)
@@ -0,0 +1,32 @@
+--- a/package.json
++++ b/package.json
+@@ -32,7 +32,6 @@
+ "keytar": "^4.0",
+ "mv": "2.0.0",
+ "ncp": "~0.5.1",
+- "npm": "3.10.10",
+ "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()
More information about the arch-commits
mailing list