From 7f910491c803cf9632fcbcce578955fabc8032e7 Mon Sep 17 00:00:00 2001 From: triallax Date: Sun, 30 Jul 2023 21:49:24 +0100 Subject: [PATCH 1/2] nodejs: update to 18.17.0. --- srcpkgs/nodejs/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 2576dbdbbbe89..7592318c2e686 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs -version=18.16.0 -revision=3 +version=18.17.0 +revision=1 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="which pkg-config python3-setuptools zlib-devel $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.gz" -checksum=6a4f5c5d76e5c50cef673099e56f19bc3266ae363f56ca0ab77dd2f3c5088c6d +checksum=7aaa157c0219b5895a4bd51d9e9731e0d0eb0ab9424fdbdcf30d01b3e5fb74e9 python_version=3 build_options="ssl libuv icu nghttp2 cares" @@ -88,7 +88,13 @@ do_build() { } do_check() { - local CI_SKIP_TESTS="test-cluster-primary-error.js,test-cluster-primary-kill.js,test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js,test-socket-write-after-fin-error.js,test-dns-perf_hooks.js" + local CI_SKIP_TESTS="test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js" + + if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + # https://github.com/nodejs/node/issues/45906 + CI_SKIP_TESTS+=",test-fs-utimes-y2K38.js" + fi + make CI_SKIP_TESTS="$CI_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only } From 667f6848ebcb6b8f38431ffbcc707f6110eb1588 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 20 Nov 2023 11:11:14 +0000 Subject: [PATCH 2/2] nodejs: update to 18.18.2, adopt. --- srcpkgs/nodejs/template | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 7592318c2e686..ae8ac83e76f90 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,35 +1,40 @@ # Template file for 'nodejs' pkgname=nodejs -version=18.17.0 +version=18.18.2 revision=1 -# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 -hostmakedepends="which pkg-config python3-setuptools zlib-devel - $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) - $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" -makedepends="zlib-devel $(vopt_if icu icu-devel) +hostmakedepends="which pkg-config python3-setuptools" +_make_depends="zlib-devel $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) - $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" + $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) + $(vopt_if brotli brotli-devel)" +makedepends="${_make_depends}" checkdepends="procps-ng iana-etc" short_desc="Evented I/O for V8 javascript" -maintainer="Enno Boland " +maintainer="triallax " license="MIT" homepage="https://nodejs.org/" distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.gz" -checksum=7aaa157c0219b5895a4bd51d9e9731e0d0eb0ab9424fdbdcf30d01b3e5fb74e9 +checksum=509cd2cfc3a515bf2257ed3886b9fac64aeaac2a70ea59c0a6e02e2dbb722132 python_version=3 -build_options="ssl libuv icu nghttp2 cares" +build_options="ssl libuv icu nghttp2 cares brotli" desc_option_ssl="Enable shared openssl" desc_option_libuv="Enable shared libuv" desc_option_icu="Enable shared icu" desc_option_nghttp2="Enable shared nghttp2" desc_option_cares="Enable shared c-ares" -build_options_default="ssl libuv icu nghttp2 cares" +desc_option_brotli="Enable shared brotli" +build_options_default="ssl libuv icu nghttp2 cares brotli" replaces="iojs>=0" conflicts="nodejs-lts-10" provides="nodejs-runtime-0_1" +if [ "$CROSS_BUILD" ]; then + # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 + hostmakedepends+=" ${_make_depends}" +fi + # https://build.voidlinux.org/builders/i686_builder/builds/27325/steps/shell_3/logs/stdio if [ "$XBPS_WORDSIZE" = 32 ]; then LDFLAGS="-Wl,--no-keep-memory" @@ -71,12 +76,13 @@ do_configure() { # to execute it within the build system fails _args+=" --cross-compiling" fi - ./configure --prefix=/usr --shared-zlib \ + ./configure --prefix=/usr --shared-zlib --enable-lto \ $(vopt_if icu --with-intl=system-icu) \ $(vopt_if ssl --shared-openssl) \ $(vopt_if libuv --shared-libuv) \ $(vopt_if nghttp2 --shared-nghttp2) \ - $(vopt_if cares --shared-cares) ${_args} + $(vopt_if cares --shared-cares) \ + $(vopt_if brotli --shared-brotli) ${_args} } do_build() { @@ -88,7 +94,10 @@ do_build() { } do_check() { - local CI_SKIP_TESTS="test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js" + local CI_SKIP_TESTS="test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js,test-tls-session-cache.js,test-tls-getprotocol.js,test-dns.js,test-tls-alert.js,test-tls-cli-min-version-1.1.js,test-tls-cli-max-version-1.1.js,test-tls-cli-min-version-1.2.js,test-tls-cli-max-version-1.2.js,test-tls-cli-min-version-1.3.js,test-tls-cli-max-version-1.3.js,test-tls-min-max-version.js,test-process-versions.js,test-strace-openat-openssl.js,test-crypto-dh.js,test-dgram-send-cb-quelches-error.js,test-https-agent-session-eviction.js" + + # https://github.com/nodejs/node/issues/50741 + CI_SKIP_TESTS+=",test-dns-resolveany.js,test-dns-resolveany-bad-ancount.js" if [ "$XBPS_TARGET_MACHINE" = i686 ]; then # https://github.com/nodejs/node/issues/45906