Date: Tuesday, April 24, 2018 @ 14:13:55 Author: tensor5 Revision: 317557
archrelease: copy trunk to community-x86_64 Added: apm/repos/community-x86_64/PKGBUILD (from rev 317556, apm/trunk/PKGBUILD) apm/repos/community-x86_64/apm.js (from rev 317556, apm/trunk/apm.js) apm/repos/community-x86_64/no-scripts.patch (from rev 317556, apm/trunk/no-scripts.patch) apm/repos/community-x86_64/python2.patch (from rev 317556, apm/trunk/python2.patch) apm/repos/community-x86_64/use-system-npm.patch (from rev 317556, 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 | 206 ++++++++++++++++++++++++------------------------- apm.js | 32 +++---- no-scripts.patch | 32 +++---- python2.patch | 28 +++--- use-system-npm.patch | 22 ++--- 5 files changed, 160 insertions(+), 160 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-24 14:13:43 UTC (rev 317556) +++ PKGBUILD 2018-04-24 14:13:55 UTC (rev 317557) @@ -1,103 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=apm -pkgver=1.19.0 -pkgrel=2 -pkgdesc='Atom package manager' -arch=('x86_64') -url='https://github.com/atom/apm' -license=('MIT') -depends=('libsecret' 'nodejs>=8' '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') -sha512sums=('642e7d4bd29455f56ad6e611de9a38954b8a403576620ea3684bc49c2d05f6be89e2ce37efa383cdd050e7ff6b0a6f4a14213f1256e1a6999d3789de0d621afa' - '7ef40058bb50189729a541f8e74191336f9652f12e70118e8b24c207e42f00c8f548d408759f261d8b0f2f67f7296e38d771694e45570102e28be1e6b9788d6c' - 'da2e2c6b336b87371541ef159201f6942c606f7c8b212f1a610a8605bb08ddc97ed1ade7f1c02339c40c40f22d8a7d37b1686fb5c7105a775fa85ff6048162dc' - '2fedcfc04c03059429c231c5bbd3d5e4b32a30ea9d341c3e27dcbba0deee1e4c8d27d993c59ee96aebf0a0c930b7cc55177e3600c18349dd2b91ebac7bd96632' - 'f07c0bc1d31d8b6d237621cde024ebf538901fd7ea61801a7c50b5be84e2adf9da72eccc68d7bea0d8b0193d750ebde7de30a572f2e286194cb5c4f6f0d2a3f3') - -_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 - ./node_modules/.bin/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 317556, apm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-24 14:13:55 UTC (rev 317557) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=apm +pkgver=1.19.0 +pkgrel=3 +pkgdesc='Atom package manager' +arch=('x86_64') +url='https://github.com/atom/apm' +license=('MIT') +depends=('libsecret' 'nodejs>=9' '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') +sha512sums=('642e7d4bd29455f56ad6e611de9a38954b8a403576620ea3684bc49c2d05f6be89e2ce37efa383cdd050e7ff6b0a6f4a14213f1256e1a6999d3789de0d621afa' + '7ef40058bb50189729a541f8e74191336f9652f12e70118e8b24c207e42f00c8f548d408759f261d8b0f2f67f7296e38d771694e45570102e28be1e6b9788d6c' + 'da2e2c6b336b87371541ef159201f6942c606f7c8b212f1a610a8605bb08ddc97ed1ade7f1c02339c40c40f22d8a7d37b1686fb5c7105a775fa85ff6048162dc' + '2fedcfc04c03059429c231c5bbd3d5e4b32a30ea9d341c3e27dcbba0deee1e4c8d27d993c59ee96aebf0a0c930b7cc55177e3600c18349dd2b91ebac7bd96632' + 'f07c0bc1d31d8b6d237621cde024ebf538901fd7ea61801a7c50b5be84e2adf9da72eccc68d7bea0d8b0193d750ebde7de30a572f2e286194cb5c4f6f0d2a3f3') + +_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 + ./node_modules/.bin/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 2018-04-24 14:13:43 UTC (rev 317556) +++ apm.js 2018-04-24 14:13:55 UTC (rev 317557) @@ -1,16 +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").trim().slice(1); - -process.env.npm_config_python = __dirname + "/python-interceptor.sh"; - -require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { - process.exitCode = +!!error; -}); Copied: apm/repos/community-x86_64/apm.js (from rev 317556, apm/trunk/apm.js) =================================================================== --- apm.js (rev 0) +++ apm.js 2018-04-24 14:13:55 UTC (rev 317557) @@ -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.npm_config_python = __dirname + "/python-interceptor.sh"; + +require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { + process.exitCode = +!!error; +}); Deleted: no-scripts.patch =================================================================== --- no-scripts.patch 2018-04-24 14:13:43 UTC (rev 317556) +++ no-scripts.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -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": { - "asar-require": "0.3.0", - "async": "~0.2.8", Copied: apm/repos/community-x86_64/no-scripts.patch (from rev 317556, apm/trunk/no-scripts.patch) =================================================================== --- no-scripts.patch (rev 0) +++ no-scripts.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -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", Deleted: python2.patch =================================================================== --- python2.patch 2018-04-24 14:13:43 UTC (rev 317556) +++ python2.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -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 317556, apm/trunk/python2.patch) =================================================================== --- python2.patch (rev 0) +++ python2.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -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 2018-04-24 14:13:43 UTC (rev 317556) +++ use-system-npm.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -1,11 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -32,8 +32,6 @@ - "keytar": "^4.0", - "mv": "2.0.0", - "ncp": "~0.5.1", -- "npm": "3.10.10", -- "node-gyp": "3.4.0", - "open": "0.0.4", - "plist": "git+https://github.com/nathansobo/node-plist.git", - "q": "~0.9.7", Copied: apm/repos/community-x86_64/use-system-npm.patch (from rev 317556, apm/trunk/use-system-npm.patch) =================================================================== --- use-system-npm.patch (rev 0) +++ use-system-npm.patch 2018-04-24 14:13:55 UTC (rev 317557) @@ -0,0 +1,11 @@ +--- a/package.json ++++ b/package.json +@@ -32,8 +32,6 @@ + "keytar": "^4.0", + "mv": "2.0.0", + "ncp": "~0.5.1", +- "npm": "3.10.10", +- "node-gyp": "3.4.0", + "open": "0.0.4", + "plist": "git+https://github.com/nathansobo/node-plist.git", + "q": "~0.9.7",