[arch-commits] Commit in apm/repos/community-x86_64 (10 files)

Nicola Squartini tensor5 at archlinux.org
Sun Dec 13 05:13:36 UTC 2020


    Date: Sunday, December 13, 2020 @ 05:13:36
  Author: tensor5
Revision: 773781

archrelease: copy trunk to community-x86_64

Added:
  apm/repos/community-x86_64/PKGBUILD
    (from rev 773780, apm/trunk/PKGBUILD)
  apm/repos/community-x86_64/apm.js
    (from rev 773780, apm/trunk/apm.js)
  apm/repos/community-x86_64/git-utils.patch
    (from rev 773780, apm/trunk/git-utils.patch)
  apm/repos/community-x86_64/no-scripts.patch
    (from rev 773780, apm/trunk/no-scripts.patch)
  apm/repos/community-x86_64/use-system-npm.patch
    (from rev 773780, 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             |  218 +++++++++++++++++++++++++------------------------
 apm.js               |   22 ++--
 git-utils.patch      |   20 ++--
 no-scripts.patch     |   42 ++++-----
 use-system-npm.patch |   20 ++--
 5 files changed, 165 insertions(+), 157 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-13 05:12:43 UTC (rev 773780)
+++ PKGBUILD	2020-12-13 05:13:36 UTC (rev 773781)
@@ -1,105 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=apm
-pkgver=2.6.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=('514caa5703fb81036c5f99b47361a7e903615f2a046d6430fce9407c93b3cc1274bafbb9f29486a6726731ea8bcfa981a68f3f4546d282ff0551ee5ed9928c9a'
-            'c02c18e00c378fc968cd593bfed3ff0636a2786fa9ef212547efc30c54576f55dc94ac503b827ec79283c5deb87a22a7046565d8c630d55ed20d0ad020f8a77f'
-            'a51ec885b0cd44ba468a98b43e42cc66546031d97b43ab86be73cd15766ef7e9ae442c9e0a495215e37a83899fd256ec18708596b75ef47dbe12d3c8da2fc084'
-            'a78f9b1539d3eb38f2cd760b64efc8e9dd44dd2faf41a2d85bc2b21101828bea931c7855221cc69cfda3695f979ee85f17b299878424739c96cc3e96bed5d17f'
-            '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 '{}' \;
-}

Copied: apm/repos/community-x86_64/PKGBUILD (from rev 773780, apm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-12-13 05:13:36 UTC (rev 773781)
@@ -0,0 +1,113 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=apm
+pkgver=2.6.1
+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=('e4b29069b2106cc9d8179344fca4fc6032751e7b878c9302a4f4af7fcf28f638e9f0d38df4b206db85f23743a7bec0287093100fee3637ff8e771388cc44ffaf'
+            'c02c18e00c378fc968cd593bfed3ff0636a2786fa9ef212547efc30c54576f55dc94ac503b827ec79283c5deb87a22a7046565d8c630d55ed20d0ad020f8a77f'
+            'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6'
+            'de912b3da4f0433be1d960e849dbaf664b6b0d9366b9b8fb784e79f4d5ea35a24cc76c11c9f662b615a66b14ac92c1009d6b85e2c02395d87e27b15daaaa59b8'
+            '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 install
+  npx coffee --compile --output lib src
+  npm uninstall coffee-script coffeelint express jasmine-focused shx node-gyp
+
+  cd node_modules/git-utils
+  patch -Np1 -i "${srcdir}/git-utils.patch"
+  node-gyp rebuild
+  cd ../..
+
+  npm pack
+}
+
+package() {
+  cd apm-${pkgver}
+
+  install -d -m755 "${pkgdir}${_apmdir}"
+  tar -xf atom-package-manager-*.tgz --strip-components 1 \
+      -C "${pkgdir}${_apmdir}"
+  cp -r node_modules "${pkgdir}${_apmdir}"
+
+  install -d -m755 "${pkgdir}/usr/bin"
+  ln -s \
+      "$(realpath --relative-to="${pkgdir}/usr/bin" "${pkgdir}${_apmdir}/bin/apm")" \
+      "${pkgdir}/usr/bin"
+
+  # Install license file
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s \
+      "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${pkgdir}${_apmdir}/LICENSE.md")" \
+      "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # Remove occurrences of ${srcdir}
+  find "${pkgdir}" -name "package.json" \
+       -exec sed -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-12-13 05:12:43 UTC (rev 773780)
+++ apm.js	2020-12-13 05:13:36 UTC (rev 773781)
@@ -1,11 +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/electron6/version", "utf8");
-
-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 773780, apm/trunk/apm.js)
===================================================================
--- apm.js	                        (rev 0)
+++ apm.js	2020-12-13 05:13:36 UTC (rev 773781)
@@ -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/electron6/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-12-13 05:12:43 UTC (rev 773780)
+++ git-utils.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -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 773780, apm/trunk/git-utils.patch)
===================================================================
--- git-utils.patch	                        (rev 0)
+++ git-utils.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -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-12-13 05:12:43 UTC (rev 773780)
+++ no-scripts.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -1,21 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -14,18 +14,6 @@
-   "bin": {
-     "apm": "./bin/apm"
-   },
--  "scripts": {
--    "check-version": "node script/check-version.js",
--    "clean:bin": "shx rm -rf bin/node_darwin_x64 bin/node.exe bin/node",
--    "clean:lib": "shx rm -rf lib && shx mkdir -p lib",
--    "clean": "npm run clean:lib && npm run clean:bin",
--    "lint": "coffeelint src spec",
--    "coffee": "coffee --compile --output lib src",
--    "build": "npm run clean:lib && npm run coffee",
--    "prepare": "npm run build",
--    "postinstall": "node script/postinstall.js",
--    "test": "npm run check-version && npm run lint && jasmine-focused --captureExceptions --coffee spec"
--  },
-   "dependencies": {
-     "@atom/plist": "0.4.4",
-     "asar-require": "0.3.0",

Copied: apm/repos/community-x86_64/no-scripts.patch (from rev 773780, apm/trunk/no-scripts.patch)
===================================================================
--- no-scripts.patch	                        (rev 0)
+++ no-scripts.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -0,0 +1,21 @@
+--- a/package.json
++++ b/package.json
+@@ -14,18 +14,6 @@
+   "bin": {
+     "apm": "bin/apm"
+   },
+-  "scripts": {
+-    "check-version": "node script/check-version.js",
+-    "clean:bin": "shx rm -rf bin/node_darwin_x64 bin/node.exe bin/node",
+-    "clean:lib": "shx rm -rf lib && shx mkdir -p lib",
+-    "clean": "npm run clean:lib && npm run clean:bin",
+-    "lint": "coffeelint src spec",
+-    "coffee": "coffee --compile --output lib src",
+-    "build": "npm run clean:lib && npm run coffee",
+-    "prepare": "npm run build",
+-    "postinstall": "node script/postinstall.js",
+-    "test": "npm run check-version && npm run lint && jasmine-focused --captureExceptions --coffee spec"
+-  },
+   "dependencies": {
+     "@atom/plist": "0.4.4",
+     "asar-require": "0.3.0",

Deleted: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2020-12-13 05:12:43 UTC (rev 773780)
+++ use-system-npm.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -1,10 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -39,7 +39,6 @@
-     "keytar": "^4.13.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",

Copied: apm/repos/community-x86_64/use-system-npm.patch (from rev 773780, apm/trunk/use-system-npm.patch)
===================================================================
--- use-system-npm.patch	                        (rev 0)
+++ use-system-npm.patch	2020-12-13 05:13:36 UTC (rev 773781)
@@ -0,0 +1,10 @@
+--- a/package.json
++++ b/package.json
+@@ -39,7 +39,6 @@
+     "keytar": "^6.0.1",
+     "mv": "2.1.1",
+     "ncp": "~2.0.0",
+-    "npm": "^6.14.9",
+     "open": "7.3.0",
+     "q": "~1.5.1",
+     "read": "~1.0.7",



More information about the arch-commits mailing list