[arch-commits] Commit in nodejs-lts-erbium/repos/community-x86_64 (7 files)

Bruno Pagani archange at gemini.archlinux.org
Sun Dec 26 22:25:27 UTC 2021


    Date: Sunday, December 26, 2021 @ 22:25:27
  Author: archange
Revision: 1083918

archrelease: copy trunk to community-x86_64

Added:
  nodejs-lts-erbium/repos/community-x86_64/PKGBUILD
    (from rev 1083917, nodejs-lts-erbium/trunk/PKGBUILD)
  nodejs-lts-erbium/repos/community-x86_64/libnghttp1.45.1_compat.patch
    (from rev 1083917, nodejs-lts-erbium/trunk/libnghttp1.45.1_compat.patch)
  nodejs-lts-erbium/repos/community-x86_64/python3.patch
    (from rev 1083917, nodejs-lts-erbium/trunk/python3.patch)
Deleted:
  nodejs-lts-erbium/repos/community-x86_64/PKGBUILD
  nodejs-lts-erbium/repos/community-x86_64/ares_compat.patch
  nodejs-lts-erbium/repos/community-x86_64/libnghttp1.45.1_compat.patch
  nodejs-lts-erbium/repos/community-x86_64/python3.patch

------------------------------+
 PKGBUILD                     |  143 ++++++++++++++++++++---------------------
 ares_compat.patch            |   19 -----
 libnghttp1.45.1_compat.patch |   44 ++++++------
 python3.patch                |  117 ++++++++++++++++-----------------
 4 files changed, 152 insertions(+), 171 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-26 22:25:20 UTC (rev 1083917)
+++ PKGBUILD	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -1,72 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=nodejs-lts-erbium
-pkgver=12.22.7
-pkgrel=2
-pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
-arch=(x86_64)
-url="https://nodejs.org/"
-license=(MIT)
-depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
-makedepends=(python procps-ng)
-optdepends=('npm: nodejs package manager')
-provides=("nodejs=$pkgver")
-conflicts=(nodejs)
-source=("${url}"/dist/v${pkgver}/node-v${pkgver}.tar.xz
-        nodejs-shared-libuv-uvwasi.patch::https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/39260.patch
-        python3.patch
-        ares_compat.patch
-        libnghttp1.45.1_compat.patch)
-# https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
-sha256sums=(cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b
-            05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd
-            20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d
-            b8e79d3495f425079352f9e95c753b257e4d9b8ecdca468660711e6da0efa6bf
-            81f8a060b40786c02de400620da4060483d910fe7a6b68d8328f3747caf54619)
-validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins <mylesborins at google.com>
-              77984A986EBC2AA786BC0F66B01FBB92821C587A  # Gibson Fahnestock <gibfahn at gmail.com>
-              B9AE9905FFD7803F25714661B63B535A4C206CA9  # Evan Lucas <evanlucas at me.com>
-              DD8F2338BAE7501E3DD5AC78C273792F7D83545D  # Rod Vagg <rod at vagg.org>
-              B9E2F5981AA6E0CD28160D9FF13993A75599653C  # Shelley Vohr <shelley.vohr at gmail.com>
-              4ED778F539E3634C779C87C6D7062848A1AB005C  # Beth Griggs <Bethany.Griggs at uk.ibm.com>
-              C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C  # Richard Lau <rlau at redhat.com> 
-              74F12602B6F1C4E913FAA37AD3A89613643B6201) # Danielle Adams <adamzdanielle at gmail.com>
-
-prepare() {
-  cd node-v${pkgver}
-  patch -p1 < ../python3.patch
-  patch -p1 < ../nodejs-shared-libuv-uvwasi.patch
-  patch -p1 < ../ares_compat.patch
-  patch -p1 < ../libnghttp1.45.1_compat.patch
-}
-
-build() {
-  cd node-v${pkgver}
-
-  ./configure \
-    --prefix=/usr \
-    --with-intl=system-icu \
-    --without-npm \
-    --shared-openssl \
-    --shared-zlib \
-    --shared-libuv \
-    --experimental-http-parser \
-    --shared-cares \
-    --shared-brotli \
-    --shared-nghttp2
-    #--shared-http-parser \
-
-  make
-}
-
-check() {
-  cd node-v${pkgver}
-  make test-only
-}
-
-package() {
-  cd node-v${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-}

Copied: nodejs-lts-erbium/repos/community-x86_64/PKGBUILD (from rev 1083917, nodejs-lts-erbium/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -0,0 +1,71 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=nodejs-lts-erbium
+pkgver=12.22.8
+pkgrel=1
+pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
+arch=(x86_64)
+url="https://nodejs.org/"
+license=(MIT)
+depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
+makedepends=(python procps-ng)
+optdepends=('npm: nodejs package manager')
+provides=("nodejs=$pkgver")
+conflicts=(nodejs)
+source=("${url}"/dist/v${pkgver}/node-v${pkgver}.tar.xz
+        nodejs-shared-libuv-uvwasi.patch::https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/39260.patch
+        python3.patch
+        libnghttp1.45.1_compat.patch)
+# https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
+sha256sums=(2785cb1da108130083224b60e4b94009a153b26ef34bb22afc5180b6be84113c
+            05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd
+            0e862ff8f49a062630f3032be7abb65007bfa47699d6ceeb806a7ec0f2bd2589
+            81f8a060b40786c02de400620da4060483d910fe7a6b68d8328f3747caf54619)
+validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins <mylesborins at google.com>
+              77984A986EBC2AA786BC0F66B01FBB92821C587A  # Gibson Fahnestock <gibfahn at gmail.com>
+              B9AE9905FFD7803F25714661B63B535A4C206CA9  # Evan Lucas <evanlucas at me.com>
+              DD8F2338BAE7501E3DD5AC78C273792F7D83545D  # Rod Vagg <rod at vagg.org>
+              B9E2F5981AA6E0CD28160D9FF13993A75599653C  # Shelley Vohr <shelley.vohr at gmail.com>
+              4ED778F539E3634C779C87C6D7062848A1AB005C  # Beth Griggs <Bethany.Griggs at uk.ibm.com>
+              C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C  # Richard Lau <rlau at redhat.com> 
+              74F12602B6F1C4E913FAA37AD3A89613643B6201) # Danielle Adams <adamzdanielle at gmail.com>
+
+prepare() {
+  cd node-v${pkgver}
+  patch -p1 < ../python3.patch
+  patch -p1 < ../nodejs-shared-libuv-uvwasi.patch
+  patch -p1 < ../libnghttp1.45.1_compat.patch
+  sed -i 's|from collections import Mapping|from collections.abc import Mapping|' deps/v8/third_party/jinja2/tests.py
+  sed -i 's|from collections import Mapping|from collections.abc import Mapping|' tools/inspector_protocol/jinja2/tests.py
+}
+
+build() {
+  cd node-v${pkgver}
+
+  ./configure \
+    --prefix=/usr \
+    --with-intl=system-icu \
+    --without-npm \
+    --shared-openssl \
+    --shared-zlib \
+    --shared-libuv \
+    --experimental-http-parser \
+    --shared-cares \
+    --shared-brotli \
+    --shared-nghttp2
+    #--shared-http-parser \
+
+  make
+}
+
+check() {
+  cd node-v${pkgver}
+  make test-only
+}
+
+package() {
+  cd node-v${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}

Deleted: ares_compat.patch
===================================================================
--- ares_compat.patch	2021-12-26 22:25:20 UTC (rev 1083917)
+++ ares_compat.patch	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -1,19 +0,0 @@
---- a/src/cares_wrap.cc
-+++ b/src/cares_wrap.cc
-@@ -39,7 +39,15 @@
- # include <netdb.h>
- #endif  // __POSIX__
- 
--# include <ares_nameser.h>
-+#if defined(__ANDROID__) || \
-+    defined(__MINGW32__) || \
-+    defined(__OpenBSD__) || \
-+    defined(_MSC_VER)
-+
-+# include <nameser.h>
-+#else
-+# include <arpa/nameser.h>
-+#endif
- 
- // OpenBSD does not define these
- #ifndef AI_ALL

Deleted: libnghttp1.45.1_compat.patch
===================================================================
--- libnghttp1.45.1_compat.patch	2021-12-26 22:25:20 UTC (rev 1083917)
+++ libnghttp1.45.1_compat.patch	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -1,22 +0,0 @@
---- a/test/parallel/test-http2-methods.js
-+++ b/test/parallel/test-http2-methods.js
-@@ -8,7 +8,7 @@ const h2 = require('http2');
- 
- const server = h2.createServer();
- 
--const methods = [undefined, 'GET', 'POST', 'PATCH', 'FOO', 'A B C'];
-+const methods = ['GET', 'POST', 'PATCH', 'FOO', 'A_B_C'];
- let expected = methods.length;
- 
- // We use the lower-level API here
---- a/test/parallel/test-http2-multiplex.js
-+++ b/test/parallel/test-http2-multiplex.js
-@@ -29,7 +29,7 @@ server.listen(0, common.mustCall(() => {
-   });
- 
-   function doRequest() {
--    const req = client.request({ ':method': 'POST ' });
-+    const req = client.request({ ':method': 'POST' });
- 
-     let data = '';
-     req.setEncoding('utf8');

Copied: nodejs-lts-erbium/repos/community-x86_64/libnghttp1.45.1_compat.patch (from rev 1083917, nodejs-lts-erbium/trunk/libnghttp1.45.1_compat.patch)
===================================================================
--- libnghttp1.45.1_compat.patch	                        (rev 0)
+++ libnghttp1.45.1_compat.patch	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -0,0 +1,22 @@
+--- a/test/parallel/test-http2-methods.js
++++ b/test/parallel/test-http2-methods.js
+@@ -8,7 +8,7 @@ const h2 = require('http2');
+ 
+ const server = h2.createServer();
+ 
+-const methods = [undefined, 'GET', 'POST', 'PATCH', 'FOO', 'A B C'];
++const methods = ['GET', 'POST', 'PATCH', 'FOO', 'A_B_C'];
+ let expected = methods.length;
+ 
+ // We use the lower-level API here
+--- a/test/parallel/test-http2-multiplex.js
++++ b/test/parallel/test-http2-multiplex.js
+@@ -29,7 +29,7 @@ server.listen(0, common.mustCall(() => {
+   });
+ 
+   function doRequest() {
+-    const req = client.request({ ':method': 'POST ' });
++    const req = client.request({ ':method': 'POST' });
+ 
+     let data = '';
+     req.setEncoding('utf8');

Deleted: python3.patch
===================================================================
--- python3.patch	2021-12-26 22:25:20 UTC (rev 1083917)
+++ python3.patch	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -1,58 +0,0 @@
-diff --git a/configure b/configure
-index 9156e13f..630ef657 100755
---- a/configure
-+++ b/configure
-@@ -1,28 +1,37 @@
- #!/bin/sh
- 
--# Locate python2 interpreter and re-execute the script.  Note that the
--# mix of single and double quotes is intentional, as is the fact that
--# the ] goes on a new line.
-+# Locate an acceptable python interpreter and then re-execute the script.
-+# Note that the mix of single and double quotes is intentional,
-+# as is the fact that the ] goes on a new line.
-+# When a 'which' call is made for a specific version of Python on Travis CI,
-+# pyenv will alert which shims are available and then will fail the build.
- _=[ 'exec' '/bin/sh' '-c' '''
-+test ${TRAVIS} && exec python "$0" "$@"  # workaround for pyenv on Travis CI
-+which python3.9 >/dev/null && exec python3.9 "$0" "$@"
-+which python3.8 >/dev/null && exec python3.8 "$0" "$@"
-+which python3.7 >/dev/null && exec python3.7 "$0" "$@"
-+which python3.6 >/dev/null && exec python3.6 "$0" "$@"
-+which python3.5 >/dev/null && exec python3.5 "$0" "$@"
-+which python3 >/dev/null && exec python3 "$0" "$@"
- which python2.7 >/dev/null && exec python2.7 "$0" "$@"
--which python2 >/dev/null && exec python2 "$0" "$@"
- exec python "$0" "$@"
- ''' "$0" "$@"
- ]
- del _
- 
- import sys
--from distutils.spawn import find_executable as which
--if sys.version_info[:2] != (2, 7):
--  sys.stderr.write('Please use Python 2.7')
-+from distutils.spawn import find_executable
- 
--  python2 = which('python2') or which('python2.7')
--
--  if python2:
--    sys.stderr.write(':\n\n')
--    sys.stderr.write('  ' + python2 + ' ' + ' '.join(sys.argv))
--
--  sys.stderr.write('\n')
-+print('Node configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
-+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
-+if sys.version_info[:2] in acceptable_pythons:
-+  import configure
-+else:
-+  python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
-+  sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
-+  for python_cmd in python_cmds:
-+      python_cmd_path = find_executable(python_cmd)
-+      if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
-+        sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
-+                                              ' '.join(sys.argv[:1])))
-   sys.exit(1)
--
--import configure

Copied: nodejs-lts-erbium/repos/community-x86_64/python3.patch (from rev 1083917, nodejs-lts-erbium/trunk/python3.patch)
===================================================================
--- python3.patch	                        (rev 0)
+++ python3.patch	2021-12-26 22:25:27 UTC (rev 1083918)
@@ -0,0 +1,59 @@
+diff --git a/configure b/configure
+index 9156e13f..630ef657 100755
+--- a/configure
++++ b/configure
+@@ -1,28 +1,38 @@
+ #!/bin/sh
+ 
+-# Locate python2 interpreter and re-execute the script.  Note that the
+-# mix of single and double quotes is intentional, as is the fact that
+-# the ] goes on a new line.
++# Locate an acceptable python interpreter and then re-execute the script.
++# Note that the mix of single and double quotes is intentional,
++# as is the fact that the ] goes on a new line.
++# When a 'which' call is made for a specific version of Python on Travis CI,
++# pyenv will alert which shims are available and then will fail the build.
+ _=[ 'exec' '/bin/sh' '-c' '''
++test ${TRAVIS} && exec python "$0" "$@"  # workaround for pyenv on Travis CI
++which python3.10 >/dev/null && exec python3.10 "$0" "$@"
++which python3.9 >/dev/null && exec python3.9 "$0" "$@"
++which python3.8 >/dev/null && exec python3.8 "$0" "$@"
++which python3.7 >/dev/null && exec python3.7 "$0" "$@"
++which python3.6 >/dev/null && exec python3.6 "$0" "$@"
++which python3.5 >/dev/null && exec python3.5 "$0" "$@"
++which python3 >/dev/null && exec python3 "$0" "$@"
+ which python2.7 >/dev/null && exec python2.7 "$0" "$@"
+-which python2 >/dev/null && exec python2 "$0" "$@"
+ exec python "$0" "$@"
+ ''' "$0" "$@"
+ ]
+ del _
+ 
+ import sys
+-from distutils.spawn import find_executable as which
+-if sys.version_info[:2] != (2, 7):
+-  sys.stderr.write('Please use Python 2.7')
++from distutils.spawn import find_executable
+ 
+-  python2 = which('python2') or which('python2.7')
+-
+-  if python2:
+-    sys.stderr.write(':\n\n')
+-    sys.stderr.write('  ' + python2 + ' ' + ' '.join(sys.argv))
+-
+-  sys.stderr.write('\n')
++print('Node configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
++acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
++if sys.version_info[:2] in acceptable_pythons:
++  import configure
++else:
++  python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
++  sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
++  for python_cmd in python_cmds:
++      python_cmd_path = find_executable(python_cmd)
++      if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
++        sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
++                                              ' '.join(sys.argv[:1])))
+   sys.exit(1)
+-
+-import configure



More information about the arch-commits mailing list