From 9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Jun 2024 00:12:24 +0100 Subject: gentoo auto-resync : 26:06:2024 - 00:12:24 --- net-libs/Manifest.gz | Bin 30997 -> 31000 bytes net-libs/nodejs/Manifest | 5 +- net-libs/nodejs/files/nodejs-22.2.0-riscv.patch | 37 +++ net-libs/nodejs/nodejs-20.15.0.ebuild | 261 ++++++++++++++++++++++ net-libs/nodejs/nodejs-22.3.0.ebuild | 3 + net-libs/webkit-gtk/Manifest | 3 +- net-libs/webkit-gtk/files/2.44.1-riscv.patch | 62 +++++ net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 + 8 files changed, 371 insertions(+), 2 deletions(-) create mode 100644 net-libs/nodejs/files/nodejs-22.2.0-riscv.patch create mode 100644 net-libs/nodejs/nodejs-20.15.0.ebuild create mode 100644 net-libs/webkit-gtk/files/2.44.1-riscv.patch (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index e7f39073ecaf..946c6bca0f71 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index fc0238a8b557..c4d3ef36fbc8 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,15 +1,18 @@ AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9 AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8 +AUX nodejs-22.2.0-riscv.patch 1760 BLAKE2B f5f033dd589637481d2a2f3e67cdbb7a6052bdb187d2666b145a76f23da6e36adeddfe2b6e1718ae4412df914f8517bec2cdc5c15b18eb9dca5dad7a6668cc04 SHA512 f2ff6da8cf5dcc994a7a20342e2928dc1821fbbf42891009a6234b6051277e0200d7e3fbba63b9a2773887591d0ad5ceb1bb3d25e5efeb557f6d00109a80253c DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3 DIST node-v18.20.3.tar.xz 40610412 BLAKE2B 7f1cb88cd4bf51ca8933344a11f710c8748b88a9cfa38f6960b8f12f0b78afbecd0fae86608b81fcaca44d98042aae5807924bb09e2088491831d6eb08615ca2 SHA512 0f518e8f3985274d5b0f48eb574675fa0a1ade6f5e59a9de706b2ade3f8a82dbea1557611a6353422090a95846b5ed107ea2476f78bee787ef4f0db8c07bc999 DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8f93ef1760c520a40c9130e6138f95ab4e87f1acbaa72142bdd801ec3050bc42d7e4fae8d6a62192c3511b922e0a SHA512 c51c4aa37cc80f3fe34381f2cdf431053124ec6b83fc8490573502adfab48601c382448132c9962ab135bebaffc257a9d5b63334ba8ff480db57b5706bbfed67 DIST node-v20.14.0.tar.xz 41795876 BLAKE2B 588c380751c12f05ccc95146f6e7f9c3eadfc77e769d836cdca1832a7739a40723fd9a7a4e59a2ab4ad087a2b2def5da76ec28077996b59ae0a6d5b2bd15d2c6 SHA512 b6148c705b2152b20c6567a9bbcbbb3925972d17273e126613b350d1d117600e2d895a93d70f793523cb903337ace9527c541a38cb10137eb81ba992778ed243 +DIST node-v20.15.0.tar.xz 41868532 BLAKE2B 07049df11e18b90ee3ebc72fdd953a64a4a925f234fcf7bfb26c472d841bd3f6f34233670d1cc67ba592eeaa714de74c6a7b89ac5a9f62a321764023a86760de SHA512 2b041ee368ca27fa1f92ec8a43237423b7e2f81dabf525e20df7b9b200a46e6d9a8c4b82beb33ec58a9351e0eea865eadfadac3d9e4d3733b1d699f0b5d4bbf3 DIST node-v22.3.0.tar.xz 44517412 BLAKE2B 38ed4e6de9be48fb252b809a0174420f0f201f583ef5fb46a446d74168a25b39e1fa95ede44bfee8e7099dfe5636b3fb2bcd1ba3d626d7dfcac01dec0bd84d0a SHA512 70d1508bb576d98ef138db5618a5b07ca4412ec8a2aa35c8ff1d76fc93221bff6d7b418ff60b9194c420ad810523d5aeb0ffa662d2fa99f9cecf299317698710 EBUILD nodejs-18.20.1.ebuild 7433 BLAKE2B e366853288364eddb38a0a598db70f83e5188a489ac2c5970eb21f9c993abd4807d87826536d0a1ea12315603edd5f0a714876d95d2aae1ef8e1ded8ee3e7030 SHA512 0a20a965b9c25f7319bc5dfca87e0ddf9f78f603a4dc334c68e750b847d5687b0e636fa199f089a004e72536435b334309ad042753a95f93800fb65515d77402 EBUILD nodejs-18.20.3.ebuild 7438 BLAKE2B 485d422711687c69adb1d5e7bd6c4dcc63cd451c90bf893252d6c81ac6fdbcdf6a64675dcba588e5190de5a44717de7cefc84561265e5fb322a81fb600a7196b SHA512 ba369ee0899f78cfda0de173a4f61b2ecd5c4321f544cfe56d6c696f6971c7c897711697626e69a3d1283367efc77015e2adaefbdc6802d4cac7385a1ce8b044 EBUILD nodejs-20.12.1.ebuild 7599 BLAKE2B 10339e186e827ab88b9830fbd76bab4a12a181fab9d6a6ce054948d8e1e64c32e54491bcc29ef6304827da39352f25ad73b01122c872c2667ee9d945f43368ca SHA512 cac02959f6cdfc3d99dbf918b910453a8175b2fce0a8dcaeebc64a21e4cb4186b19d5f4ce46b237de52c7e66e8f9a9dc4a353b9c12969f7370c82d91ef281b02 EBUILD nodejs-20.14.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b -EBUILD nodejs-22.3.0.ebuild 7788 BLAKE2B 8e1de08dd2d0d60367d72c4dae504f0cd542da5f316daf1f706b9a871a5ed3cc52ee4f153ed83ca82d29e1da32744452badcdaed22351761378f08a01b6f8d27 SHA512 d302640c0c5857204d18d759ce607bdbce5bc490f6188b6218f52fb9b96bf2c20a182c819bd4bcc49aff7e2e951155fec34861a9f27401cc71adf0c7b9c8b625 +EBUILD nodejs-20.15.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b +EBUILD nodejs-22.3.0.ebuild 7861 BLAKE2B fb2ce11bdcaf245ab37ce6cdd96802fe99521779fce4862b554544b86dff5b7118f531d1897b0bb1f8ee1b4b1fd8646e92e7e6b77d65b25486021ad8341a1bd9 SHA512 73bb62bb04bbf600b0c49b49814a3e83e4c071c8c988349c5c76e820aba51670e4d924216f2e29fdc4e799bc461d56091e2531c8684496308ee0eccadb7c835c EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6 diff --git a/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch b/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch new file mode 100644 index 000000000000..44c696307240 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-22.2.0-riscv.patch @@ -0,0 +1,37 @@ +From 2674676fe3b01cc9652a5922badc9b044080fce7 Mon Sep 17 00:00:00 2001 +From: Lu Yahan +Date: Wed, 8 May 2024 16:34:24 +0800 +Subject: [PATCH] tools: fix riscv64 build failed + +--- + tools/v8_gypfiles/v8.gyp | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index 1e2b3645132aab..ab96e0c7d2c1f2 100644 +--- a/tools/v8_gypfiles/v8.gyp ++++ b/tools/v8_gypfiles/v8.gyp +@@ -1150,6 +1150,23 @@ + 'sources': [ + '=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.46.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + >=net-libs/ngtcp2-1.1.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-ngtcp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-22.3.0.ebuild b/net-libs/nodejs/nodejs-22.3.0.ebuild index 37c99da5a59e..ee0eb0823bd1 100644 --- a/net-libs/nodejs/nodejs-22.3.0.ebuild +++ b/net-libs/nodejs/nodejs-22.3.0.ebuild @@ -104,6 +104,9 @@ src_prepare() { # We need to disable mprotect on two files when it builds Bug 694100. use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + # bug 931256 + use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch ) + default } diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 89fc10d96e97..ab38cb452a39 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,8 +1,9 @@ AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7 AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034 SHA512 7f2420e49e085fecd630a62866ba2df0470e89f5bf92251436e9aca55200a158b96e866bf15bef283abf4b81d484d9747368fcd3ed2c58d0650aee1df9d9cd52 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802 +AUX 2.44.1-riscv.patch 2977 BLAKE2B 37a6e22cea8f621e1857141a77b886d82afca1bec70d56b5ecce4b5f89eefc1c0c311f11521840872314a1372ef4666b71000ed14eec787a26c4dc694a1168b3 SHA512 ee5ecbc98c0a40d41477975adc9d4d093cecb9dfe26901f6a5eed510bcefb505885fd7dc99cccc20a79661df900a70a985d2cf740f51481037a8888961488cda DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169 EBUILD webkit-gtk-2.44.1-r410.ebuild 8153 BLAKE2B 06c69a117128b5489925c4ee7d373d4152679155a30b83472e3c382be96fda4ec19322f3b73ce7a9524f5be61db71b6fe126876817777be22ba9844de84d2854 SHA512 1af3eabd3e18786bc027eb72168b03ccacec24daddfc9eeaf886d97bbf6ab29d7a5039e191d5ebf9fe156cc069ca9c57b09f58f3955f5b8905ffe2f1188ddb58 -EBUILD webkit-gtk-2.44.1-r600.ebuild 8846 BLAKE2B e95a70b739d0df8e85414c8ed3c16d70cb40fe6bddb8f41bc4322f02ac9f8d88197d8687ba555b1d071e44851c85545e75d898d865361ea74e55375eac498d4d SHA512 287c81e077b8ad094823fa4a8cbaad7a8d3b6fbbf3d6bfe62c05a9509502abebdf1421b1e31427a6a959a5d3e6bcb5ff9292b773b7aa3b05c7e7d5b1f3151060 +EBUILD webkit-gtk-2.44.1-r600.ebuild 8923 BLAKE2B 060e3e00a95a062cea4710d2d1e47cf77dae266aa978dd1883cfb37f07f835048494b18b936c3aa262fa8f4e5aa519559704bb657e0d6ceeb1afcd0b060c3b99 SHA512 35edaf1c7839d3f5f522ebc5e02c6d2f6f1fd57a6a963c120a62ecac8cefc21da5e027501acad4342aaa2d7b43f475ff39a92372ddbfa20c2899ce711cc93578 EBUILD webkit-gtk-2.44.1.ebuild 8001 BLAKE2B 1ecfff526fca6a304d9334a095f031a59d619645b5dcd6fdc8b2f9024af99e82e0a0fbd790b702894780fad3612971dad37257cd10dcd2ceb1ef75fb010723fc SHA512 9a08a2ff8248c40751d7ff5b6bee72d214ed86cbf7c6c00cac87b24d184dba07d618f329efd31026a2291ae9cb29393eb0f078f875b54dd381e2d061c5ff6df1 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1 diff --git a/net-libs/webkit-gtk/files/2.44.1-riscv.patch b/net-libs/webkit-gtk/files/2.44.1-riscv.patch new file mode 100644 index 000000000000..fce0cec50113 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.1-riscv.patch @@ -0,0 +1,62 @@ +From 30e1d5e22213fdaca2a29ec3400c927d710a37a8 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 16 Jan 2023 17:03:30 +0100 +Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix + !ENABLE(WEBASSEMBLY_B3JIT) + +https://bugs.webkit.org/show_bug.cgi?id=250681 + +Reviewed by NOBODY (OOPS!). + +WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). +Also, toB3Type and simdScalarType are not defined if it is included. + +Signed-off-by: Thomas Devoogdt +--- + Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp +index d06a76023392..53bf8b16ed86 100644 +--- a/Source/JavaScriptCore/b3/B3Validate.cpp ++++ b/Source/JavaScriptCore/b3/B3Validate.cpp +@@ -47,6 +47,12 @@ + #include + #include + ++#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) ++#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) ++#else ++#define simdScalarTypeToB3Type(type) B3::Type() ++#endif ++ + namespace JSC { namespace B3 { + + namespace { +@@ -452,7 +458,7 @@ class Validater { + case VectorExtractLane: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); +- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); + break; + case VectorReplaceLane: +@@ -460,7 +466,7 @@ class Validater { + VALIDATE(value->numChildren() == 2, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); +- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + case VectorNot: + case VectorAbs: +@@ -475,7 +481,7 @@ class Validater { + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); +- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + + case VectorPopcnt: diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild index dca160b9f744..2c87e2a468dc 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild @@ -155,6 +155,8 @@ src_prepare() { eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix USE=-jumbo-build on all arches eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch + # Fix building on riscv, bug 933675 + eapply "${FILESDIR}"/${PV}-riscv.patch } src_configure() { -- cgit v1.2.3