Date: Sunday, December 26, 2021 @ 22:25:20 Author: archange Revision: 1083917
upgpkg: nodejs-lts-erbium 12.22.8-1 Also Python 3.10 support fixes Modified: nodejs-lts-erbium/trunk/PKGBUILD nodejs-lts-erbium/trunk/python3.patch Deleted: nodejs-lts-erbium/trunk/ares_compat.patch -------------------+ PKGBUILD | 13 ++++++------- ares_compat.patch | 19 ------------------- python3.patch | 5 +++-- 3 files changed, 9 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-26 22:18:43 UTC (rev 1083916) +++ PKGBUILD 2021-12-26 22:25:20 UTC (rev 1083917) @@ -2,8 +2,8 @@ # Contributor: Felix Yan <felixonm...@archlinux.org> pkgname=nodejs-lts-erbium -pkgver=12.22.7 -pkgrel=2 +pkgver=12.22.8 +pkgrel=1 pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)" arch=(x86_64) url="https://nodejs.org/" @@ -16,13 +16,11 @@ 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 +sha256sums=(2785cb1da108130083224b60e4b94009a153b26ef34bb22afc5180b6be84113c 05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd - 20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d - b8e79d3495f425079352f9e95c753b257e4d9b8ecdca468660711e6da0efa6bf + 0e862ff8f49a062630f3032be7abb65007bfa47699d6ceeb806a7ec0f2bd2589 81f8a060b40786c02de400620da4060483d910fe7a6b68d8328f3747caf54619) validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins <mylesbor...@google.com> 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock <gibf...@gmail.com> @@ -37,8 +35,9 @@ 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 + 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() { Deleted: ares_compat.patch =================================================================== --- ares_compat.patch 2021-12-26 22:18:43 UTC (rev 1083916) +++ ares_compat.patch 2021-12-26 22:25:20 UTC (rev 1083917) @@ -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 Modified: python3.patch =================================================================== --- python3.patch 2021-12-26 22:18:43 UTC (rev 1083916) +++ python3.patch 2021-12-26 22:25:20 UTC (rev 1083917) @@ -2,7 +2,7 @@ index 9156e13f..630ef657 100755 --- a/configure +++ b/configure -@@ -1,28 +1,37 @@ +@@ -1,28 +1,38 @@ #!/bin/sh -# Locate python2 interpreter and re-execute the script. Note that the @@ -15,6 +15,7 @@ +# 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" "$@" @@ -42,7 +43,7 @@ - - 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)) ++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: