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

Evangelos Foutras foutrelis at gemini.archlinux.org
Wed Oct 20 23:48:59 UTC 2021


    Date: Wednesday, October 20, 2021 @ 23:48:58
  Author: foutrelis
Revision: 1031648

archrelease: copy trunk to community-testing-x86_64

Added:
  apm/repos/community-testing-x86_64/PKGBUILD
    (from rev 1031647, apm/trunk/PKGBUILD)
  apm/repos/community-testing-x86_64/apm.js
    (from rev 1031647, apm/trunk/apm.js)
  apm/repos/community-testing-x86_64/git-utils.patch
    (from rev 1031647, apm/trunk/git-utils.patch)
  apm/repos/community-testing-x86_64/no-scripts.patch
    (from rev 1031647, apm/trunk/no-scripts.patch)
Deleted:
  apm/repos/community-testing-x86_64/PKGBUILD
  apm/repos/community-testing-x86_64/apm.js
  apm/repos/community-testing-x86_64/git-utils.patch
  apm/repos/community-testing-x86_64/no-scripts.patch

------------------+
 PKGBUILD         |  221 +++++++++++++++++++++++++++--------------------------
 apm.js           |   22 ++---
 git-utils.patch  |   20 ++--
 no-scripts.patch |   42 +++++-----
 4 files changed, 155 insertions(+), 150 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-20 23:48:52 UTC (rev 1031647)
+++ PKGBUILD	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -1,108 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=apm
-pkgver=2.6.4
-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)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
-        'apm.js'
-        'no-scripts.patch'
-        'git-utils.patch')
-sha512sums=('6549b7546afe3053f61804ee324b6dec72e409dbf433b2e7191b99deb189f94d640b7e140b689ab380f5269ba0b9a78132d2745dd6d2689673261d6445183868'
-            '36bbf34a3a7ba9ed63ed1d805be9d7906d284077ff72a4c8199efc1f04ac672c4a1a75568f2c9d81037481452d3a47c3e54370a76e9ed7b35e67fda93acd1726'
-            'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6'
-            '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
-
-  # 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 '{}' \;
-}

Copied: apm/repos/community-testing-x86_64/PKGBUILD (from rev 1031647, apm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -0,0 +1,113 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=apm
+pkgver=2.6.4
+pkgrel=3
+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"
+        "${pkgname}-bump-first-mate.patch::https://github.com/atom/apm/commit/42134ae3278d.patch"
+        'apm.js'
+        'no-scripts.patch'
+        'git-utils.patch')
+sha512sums=('6549b7546afe3053f61804ee324b6dec72e409dbf433b2e7191b99deb189f94d640b7e140b689ab380f5269ba0b9a78132d2745dd6d2689673261d6445183868'
+            'e8725530497a415e0ad7cc51e3855ab5b3eb33b926c3526e439f29e333e0a93cc0a692b46b68819ddbfdcaedb1a1bc2a6161fb9c1c8e34b33ac35a552639311b'
+            '36bbf34a3a7ba9ed63ed1d805be9d7906d284077ff72a4c8199efc1f04ac672c4a1a75568f2c9d81037481452d3a47c3e54370a76e9ed7b35e67fda93acd1726'
+            'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6'
+            '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
+
+  # Don't download binary Node
+  patch -Np1 -i "${srcdir}"/no-scripts.patch
+  rm BUNDLED_NODE_VERSION script/*
+
+  # Fix build with nodejs 17
+  patch -Np1 -i "${srcdir}/${pkgname}-bump-first-mate.patch"
+}
+
+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	2021-10-20 23:48:52 UTC (rev 1031647)
+++ apm.js	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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/electron9/version", "utf8");
-
-require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) {
-    process.exitCode = Number(Boolean(error));
-});

Copied: apm/repos/community-testing-x86_64/apm.js (from rev 1031647, apm/trunk/apm.js)
===================================================================
--- apm.js	                        (rev 0)
+++ apm.js	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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/electron9/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	2021-10-20 23:48:52 UTC (rev 1031647)
+++ git-utils.patch	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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-testing-x86_64/git-utils.patch (from rev 1031647, apm/trunk/git-utils.patch)
===================================================================
--- git-utils.patch	                        (rev 0)
+++ git-utils.patch	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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	2021-10-20 23:48:52 UTC (rev 1031647)
+++ no-scripts.patch	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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-testing-x86_64/no-scripts.patch (from rev 1031647, apm/trunk/no-scripts.patch)
===================================================================
--- no-scripts.patch	                        (rev 0)
+++ no-scripts.patch	2021-10-20 23:48:58 UTC (rev 1031648)
@@ -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",



More information about the arch-commits mailing list