From 7e5aa3d109d65cfe6ec04371d68dce250f72c9c1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 Jun 2026 02:31:33 +0100 Subject: [PATCH] net-libs/nodejs: sync live Signed-off-by: Sam James --- net-libs/nodejs/nodejs-99999999.ebuild | 43 +++++++++++++++++--------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 7043382a68003..314624e00e8b6 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -25,7 +25,7 @@ else S="${WORKDIR}/node-v${PV}" fi -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu +inspector npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu +inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -34,23 +34,23 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.1.0:= +COMMON_DEPEND=">=app-arch/brotli-1.1.0:= + dev-db/sqlite:3 >=dev-cpp/ada-3.3.0:= >=dev-cpp/simdutf-7.3.4:= - dev-db/sqlite:3 - >=dev-libs/libuv-1.51.0:= - >=dev-libs/simdjson-3.10.1:= - >=net-dns/c-ares-1.34.4:= - >=net-libs/nghttp2-1.64.0:= - >=net-libs/nghttp3-1.7.0:= + >=dev-libs/libuv-1.52.1:= + >=dev-libs/simdjson-4.6.1:= + >=net-dns/c-ares-1.34.5:= + >=net-libs/nghttp2-1.67.1:= + >=net-libs/nghttp3-1.14.0:= virtual/zlib:= corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( - >=net-libs/ngtcp2-1.9.1:= - >=dev-libs/openssl-1.1.1:0= + >=net-libs/ngtcp2-1.14.0:= + >=dev-libs/openssl-3.5.6:0= ) - !system-ssl? ( >=net-libs/ngtcp2-1.9.1:=[-gnutls] ) + !system-ssl? ( >=net-libs/ngtcp2-1.14.0:=[-gnutls] ) || ( sys-devel/gcc:* llvm-runtimes/libatomic-stub @@ -61,7 +61,8 @@ BDEPEND="${PYTHON_DEPS} virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" # These are measured on a loong machine with -ggdb on, and only checked # if debugging flags are present in CFLAGS. @@ -113,7 +114,11 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch ) + use pax-kernel && + PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch ) + + use ppc64 && + PATCHES+=( "${FILESDIR}/${PN}-24.11.1-restore-ppc64be.patch" ) default } @@ -143,7 +148,7 @@ src_configure() { --shared-zlib ) use debug && myconf+=( --debug ) - tc-is-lto && myconf+=( --enable-lto ) + use lto && myconf+=( --enable-lto ) if use system-icu; then myconf+=( --with-intl=system-icu ) elif use icu; then @@ -266,6 +271,16 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-tls-session-timeout.js test/sequential/test-util-debug.js + # Breaking change in nghttp2 1.67.1, see + # https://github.com/nodejs/node/issues/60661 + # https://github.com/nodejs/node/commit/b426a47c05e6b039ed65798d0ad3b3698b35fd97 + # https://github.com/nghttp2/nghttp2/issues/2604 + test/parallel/test-http2-client-unescaped-path.js + test/parallel/test-http2-multi-content-length.js + test/parallel/test-http2-reset-flood.js + test/parallel/test-http2-max-invalid-frames.js + test/parallel/test-http2-misbehaving-flow-control.js + test/parallel/test-http2-misbehaving-flow-control-paused.js ) use inspector || drop_tests+=(