Date: Friday, May 8, 2020 @ 01:17:56 Author: tensor5 Revision: 625510
archrelease: copy trunk to community-x86_64 Added: apm/repos/community-x86_64/PKGBUILD (from rev 625509, apm/trunk/PKGBUILD) apm/repos/community-x86_64/apm.js (from rev 625509, apm/trunk/apm.js) apm/repos/community-x86_64/git-utils.patch (from rev 625509, apm/trunk/git-utils.patch) apm/repos/community-x86_64/no-scripts.patch (from rev 625509, apm/trunk/no-scripts.patch) apm/repos/community-x86_64/use-system-npm.patch (from rev 625509, 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/git-utils.patch apm/repos/community-x86_64/no-scripts.patch apm/repos/community-x86_64/use-system-npm.patch ----------------------+ PKGBUILD | 210 ++++++++++++++++++++++++------------------------- apm.js | 24 ++--- git-utils.patch | 20 ++-- no-scripts.patch | 32 +++---- use-system-npm.patch | 20 ++-- 5 files changed, 152 insertions(+), 154 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-08 01:17:09 UTC (rev 625509) +++ PKGBUILD 2020-05-08 01:17:56 UTC (rev 625510) @@ -1,105 +0,0 @@ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=apm -pkgver=2.4.5 -pkgrel=2 -pkgdesc='Atom package manager' -arch=('x86_64') -url='https://github.com/atom/apm' -license=('MIT') -depends=('libsecret' 'nodejs>=10' 'npm' 'python') -makedepends=('git') -provides=('nodejs-atom-package-manager') -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' - 'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6') - -_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/* -} - -build() { - cd apm-${pkgver} - - npm update keytar # Node 12 - 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) - - cd "${srcdir}/apm-build/usr/lib/node_modules/atom-package-manager/node_modules/git-utils" - patch -Np1 -i "${srcdir}/git-utils.patch" - node-gyp rebuild -} - -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/*.{cc,h}" -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 625509, apm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-08 01:17:56 UTC (rev 625510) @@ -0,0 +1,105 @@ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=apm +pkgver=2.5.0 +pkgrel=1 +pkgdesc='Atom package manager' +arch=('x86_64') +url='https://github.com/atom/apm' +license=('MIT') +depends=('libsecret' 'nodejs>=10' 'npm' 'python') +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' + 'use-system-npm.patch' + 'git-utils.patch') +sha512sums=('34fdd9646d9ea67731aed7560547fb74fcb2f19a2ae69dd692834dffc7e0f2d7a9b1147f774e0f1bc9d491d57755f674073268dd599fa00e41673d2150883223' + '1f31778fca9540c7861ec13e15631f141997791e804582d1ba9e5c2a57c02ff62250b340f3166d103e7ed824fb05a993778f35e1a3575905b8582909adbfd159' + '4ad07dcf6fca3aabdd106f092d3a159712f52c4b161c54e7ac2c1d90598b98635dc86e8e97ec6f847392110c894b0b0ffb89be9f82164cd4a377a7dc53ac7b9a' + 'd14c3465f068959580a8232b53740aa199e25b67e5c209b824ac1060aca4a6a12083cf2d495683abcc7faba4d4d1c4fe3276679c79c1754954b0eaf5e2d4eea2' + 'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6') + +_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/* +} + +build() { + cd apm-${pkgver} + + npm update keytar # Node 12 + 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) + + cd "${srcdir}/apm-build/usr/lib/node_modules/atom-package-manager/node_modules/git-utils" + patch -Np1 -i "${srcdir}/git-utils.patch" + node-gyp rebuild +} + +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/*.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 '{}' \; \ + -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 2020-05-08 01:17:09 UTC (rev 625509) +++ apm.js 2020-05-08 01:17:56 UTC (rev 625510) @@ -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/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)); -}); Copied: apm/repos/community-x86_64/apm.js (from rev 625509, apm/trunk/apm.js) =================================================================== --- apm.js (rev 0) +++ apm.js 2020-05-08 01:17:56 UTC (rev 625510) @@ -0,0 +1,11 @@ +#!/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/electron4/version", "utf8"); + +require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { + process.exitCode = Number(Boolean(error)); +}); Deleted: git-utils.patch =================================================================== --- git-utils.patch 2020-05-08 01:17:09 UTC (rev 625509) +++ git-utils.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -1,10 +0,0 @@ ---- a/binding.gyp -+++ b/binding.gyp -@@ -162,6 +162,7 @@ - 'deps/libgit2/src/message.h', - 'deps/libgit2/src/mwindow.c', - 'deps/libgit2/src/mwindow.h', -+ 'deps/libgit2/src/net.c', - 'deps/libgit2/src/netops.c', - 'deps/libgit2/src/netops.h', - 'deps/libgit2/src/notes.c', Copied: apm/repos/community-x86_64/git-utils.patch (from rev 625509, apm/trunk/git-utils.patch) =================================================================== --- git-utils.patch (rev 0) +++ git-utils.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -0,0 +1,10 @@ +--- a/binding.gyp ++++ b/binding.gyp +@@ -162,6 +162,7 @@ + 'deps/libgit2/src/message.h', + 'deps/libgit2/src/mwindow.c', + 'deps/libgit2/src/mwindow.h', ++ 'deps/libgit2/src/net.c', + 'deps/libgit2/src/netops.c', + 'deps/libgit2/src/netops.h', + 'deps/libgit2/src/notes.c', Deleted: no-scripts.patch =================================================================== --- no-scripts.patch 2020-05-08 01:17:09 UTC (rev 625509) +++ no-scripts.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -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 625509, apm/trunk/no-scripts.patch) =================================================================== --- no-scripts.patch (rev 0) +++ no-scripts.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -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", +- "prepare": "grunt prepare", +- "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: use-system-npm.patch =================================================================== --- use-system-npm.patch 2020-05-08 01:17:09 UTC (rev 625509) +++ use-system-npm.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -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 625509, apm/trunk/use-system-npm.patch) =================================================================== --- use-system-npm.patch (rev 0) +++ use-system-npm.patch 2020-05-08 01:17:56 UTC (rev 625510) @@ -0,0 +1,10 @@ +--- a/package.json ++++ b/package.json +@@ -33,7 +33,6 @@ + "keytar": "^4.0", + "mv": "2.0.0", + "ncp": "~0.5.1", +- "npm": "^6.14.4", + "open": "0.0.5", + "q": "~0.9.7", + "read": "~1.0.5",