diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index b595568..db079ee 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -2,24 +2,28 @@ # Contributor: Felix Yan pkgname=nodejs-lts-erbium -pkgver=12.22.4 -pkgrel=2 +pkgver=12.22.7 +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) +makedepends=(python procps-ng patchutils) 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) + python3.patch + ares_compat.patch + https://github.com/nodejs/node/commit/685c7d43a5165144faeba3445c399d0c3b65350b.patch) # https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc -sha256sums=(44cd4eab131e5282fc923e9e720d983a0b44c12e4aa4f6c3598dc97ae1e4cd4c - 05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd - 20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d) +sha256sums=('cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b' + '05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd' + '20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d' + '94ef4408d7526d4d0b2c04749283e7de5c1a3aec488094704031ac31c25f8a32' + 'b557625a3a038dec32fdac36303ce98d07c418c3c857dec047ad7b4c872ae1e9') validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock B9AE9905FFD7803F25714661B63B535A4C206CA9 # Evan Lucas @@ -32,6 +36,8 @@ prepare() { cd node-v${pkgver} patch -p1 < ../python3.patch patch -p1 < ../nodejs-shared-libuv-uvwasi.patch + patch -p1 < ../ares_compat.patch + filterdiff -i 'test/parallel/*' -p1 ../685c7d43a5165144faeba3445c399d0c3b65350b.patch | patch -p1 } build() { diff --git a/trunk/ares_compat.patch b/trunk/ares_compat.patch new file mode 100644 index 0000000..b447421 --- /dev/null +++ b/trunk/ares_compat.patch @@ -0,0 +1,23 @@ +Description: keep nodejs compatible with libc-ares 1.17.1 +Forwarded: not-needed +Last-Update: 2021-08-11 +Author: Jérémy Lal +--- a/src/cares_wrap.cc ++++ b/src/cares_wrap.cc +@@ -39,7 +39,15 @@ + # include + #endif // __POSIX__ + +-# include ++#if defined(__ANDROID__) || \ ++ defined(__MINGW32__) || \ ++ defined(__OpenBSD__) || \ ++ defined(_MSC_VER) ++ ++# include ++#else ++# include ++#endif + + // OpenBSD does not define these + #ifndef AI_ALL