diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index c385f53..f27b74f 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -1,35 +1,37 @@ # Maintainer: Nicola Squartini pkgname=apm -pkgver=2.6.4 -pkgrel=3 +pkgver=2.6.5 +pkgrel=1 pkgdesc='Atom package manager' arch=('x86_64') url='https://github.com/atom/apm' license=('MIT') -depends=('libsecret' 'nodejs>=10' 'npm' 'python') +depends=('libsecret' 'nodejs-lts-gallium' '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" +source=("git+https://github.com/atom/apm.git#commit=ade8fbe124b18f5949a6b20b8e02a551d5405d67" "${pkgname}-bump-first-mate.patch::https://github.com/atom/apm/commit/42134ae3278d.patch" 'apm.js' 'no-scripts.patch' - 'git-utils.patch') -sha512sums=('6549b7546afe3053f61804ee324b6dec72e409dbf433b2e7191b99deb189f94d640b7e140b689ab380f5269ba0b9a78132d2745dd6d2689673261d6445183868' + 'git-utils.patch' + apm-2.6.5.patch) +sha512sums=('SKIP' 'e8725530497a415e0ad7cc51e3855ab5b3eb33b926c3526e439f29e333e0a93cc0a692b46b68819ddbfdcaedb1a1bc2a6161fb9c1c8e34b33ac35a552639311b' - '36bbf34a3a7ba9ed63ed1d805be9d7906d284077ff72a4c8199efc1f04ac672c4a1a75568f2c9d81037481452d3a47c3e54370a76e9ed7b35e67fda93acd1726' + '6ccc1b4bbc900fcb40eac4d9961e6499634e6cf85bc0860c9c7865a485b700b13317ddb9b092081193421325902a1766036ed39b8f9405a041b4b8f93adae36d' 'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6' - 'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6') + 'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6' + 'a352424b64cf8995b97bfd048d487aee0270b130aaa7a2d9fedcdd2b372835b2dfc356d56c24274840ca28b960dae6e35cb060697ba25d98eb07fe9519a4f036') _apmdir='/usr/lib/node_modules/atom-package-manager' prepare() { rm -rf "${srcdir}"/apm-build - cd apm-${pkgver} + cd apm # Use custom launcher rm bin/apm{,.cmd} bin/npm{,.cmd} @@ -41,12 +43,11 @@ prepare() { rm BUNDLED_NODE_VERSION script/* # Fix build with nodejs 17 - patch -Np1 -i "${srcdir}/${pkgname}-bump-first-mate.patch" +# patch -Np1 -i "${srcdir}/${pkgname}-bump-first-mate.patch" } build() { - cd apm-${pkgver} - + cd apm npm install npx coffee --compile --output lib src npm uninstall coffee-script coffeelint express jasmine-focused shx node-gyp @@ -60,7 +61,7 @@ build() { } package() { - cd apm-${pkgver} + cd apm install -d -m755 "${pkgdir}${_apmdir}" tar -xf atom-package-manager-*.tgz --strip-components 1 \ diff --git a/trunk/apm-2.6.5.patch b/trunk/apm-2.6.5.patch new file mode 100644 index 0000000..d9b3315 --- /dev/null +++ b/trunk/apm-2.6.5.patch @@ -0,0 +1,159 @@ +diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml +index 7af2a0e..b694412 100644 +--- a/.github/workflows/CI.yml ++++ b/.github/workflows/CI.yml +@@ -16,7 +16,6 @@ jobs: + - macos-latest + - windows-latest + node_version: +- - 10 + - 12 + - 14 + node_arch: +diff --git a/package-lock.json b/package-lock.json +index 9531867..5b88b8e 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -1,6 +1,6 @@ + { + "name": "atom-package-manager", +- "version": "2.6.4", ++ "version": "2.6.5", + "lockfileVersion": 1, + "requires": true, + "dependencies": { +@@ -828,17 +828,17 @@ + } + }, + "ext": { +- "version": "1.2.1", +- "resolved": "https://registry.npmjs.org/ext/-/ext-1.2.1.tgz", +- "integrity": "sha512-x+OKKC57tNiLhDW26UmWtvQBpvO+2wxdC/A0jP7RkmjAc4gze9/U98hQyIYJUzo9A+o9ntMHpC+LH3pWMSbrVQ==", ++ "version": "1.4.0", ++ "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", ++ "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", +- "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==" ++ "version": "2.5.0", ++ "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", ++ "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==" + } + } + }, +@@ -922,45 +922,17 @@ + } + }, + "first-mate": { +- "version": "7.4.1", +- "resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.1.tgz", +- "integrity": "sha512-SEG5W0aajCvK/Ngoo3he3Ib4DsT+CRPhBAgSju5hksBLvvUfRWP7Jf3+HQ+CNTD4GZZqbDNOEJNOxbf35EblrQ==", ++ "version": "7.4.3", ++ "resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.3.tgz", ++ "integrity": "sha512-PtZUpaPmcV5KV4Rw5TfwczEnExN+X1o3Q/G82E4iRJ0tW91fm3Yi7pa5t4cBH8r3D6EyoBKvfpG2jKE+TZ0/nw==", + "requires": { + "emissary": "^1", + "event-kit": "^2.2.0", + "fs-plus": "^3.0.0", + "grim": "^2.0.1", +- "oniguruma": "7.2.1", ++ "oniguruma": "^7.2.3", + "season": "^6.0.2", + "underscore-plus": "^1" +- }, +- "dependencies": { +- "async": { +- "version": "1.5.2", +- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", +- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" +- }, +- "fs-plus": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-3.1.1.tgz", +- "integrity": "sha512-Se2PJdOWXqos1qVTkvqqjb0CSnfBnwwD+pq+z4ksT+e97mEShod/hrNg0TRCCsXPbJzcIq+NuzQhigunMWMJUA==", +- "requires": { +- "async": "^1.5.2", +- "mkdirp": "^0.5.1", +- "rimraf": "^2.5.2", +- "underscore-plus": "1.x" +- }, +- "dependencies": { +- "rimraf": { +- "version": "2.7.1", +- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", +- "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", +- "requires": { +- "glob": "^7.1.3" +- } +- } +- } +- } + } + }, + "forever-agent": { +@@ -1148,9 +1120,9 @@ + "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" + }, + "grim": { +- "version": "2.0.2", +- "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", +- "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", ++ "version": "2.0.3", ++ "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.3.tgz", ++ "integrity": "sha512-FM20Ump11qYLK9k9DbL8yzVpy+YBieya1JG15OeH8s+KbHq8kL4SdwRtURwIUHniSxb24EoBUpwKfFjGNVi4/Q==", + "requires": { + "event-kit": "^2.0.0" + } +@@ -1604,9 +1576,9 @@ + } + }, + "nan": { +- "version": "2.14.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", +- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" ++ "version": "2.14.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", ++ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" + }, + "napi-build-utils": { + "version": "1.0.2", +@@ -4873,9 +4845,9 @@ + } + }, + "oniguruma": { +- "version": "7.2.1", +- "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-7.2.1.tgz", +- "integrity": "sha512-WPS/e1uzhswPtJSe+Zls/kAj27+lEqZjCmRSjnYk/Z4L2Mu+lJC2JWtkZhPJe4kZeTQfz7ClcLyXlI4J68MG2w==", ++ "version": "7.2.3", ++ "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-7.2.3.tgz", ++ "integrity": "sha512-PZZcE0yfg8Q1IvaJImh21RUTHl8ep0zwwyoE912KqlWVrsGByjjj29sdACcD1BFyX2bLkfuOJeP+POzAGVWtbA==", + "requires": { + "nan": "^2.14.0" + } +diff --git a/package.json b/package.json +index a75b3e6..0e20a3f 100644 +--- a/package.json ++++ b/package.json +@@ -1,7 +1,7 @@ + { + "name": "atom-package-manager", + "description": "Atom package manager", +- "version": "2.6.4", ++ "version": "2.6.5", + "license": "MIT", + "repository": { + "type": "git", +@@ -31,7 +31,7 @@ + "asar-require": "0.3.0", + "async": "^3.2.0", + "colors": "~1.4.0", +- "first-mate": "^7.4.1", ++ "first-mate": "^7.4.3", + "fs-plus": "3.x", + "git-utils": "^5.7.2", + "glob": "^7.1.6", diff --git a/trunk/apm.js b/trunk/apm.js index ebcc763..eadf330 100644 --- a/trunk/apm.js +++ b/trunk/apm.js @@ -4,7 +4,7 @@ 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/electron9/version", "utf8"); +process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || require("fs").readFileSync("/usr/lib/electron11/version", "utf8"); require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { process.exitCode = Number(Boolean(error));