gentoo auto-resync : 17:11:2024 - 03:03:09

3 files changed, 55 insertions, 15 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 01488ac80ff2..d8eb2bde1b90 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -212,6 +212,7 @@ DIST firefox-128.4.0esr-zh-TW.xpi 672066 BLAKE2B 3e90953b69d12ad01f0a4aa7d48d187
 DIST firefox-128.4.0esr.source.tar.xz 558619512 BLAKE2B 1f0528c8806bb034af623f2022740bb5056ea11817b9cb7154a60b87f04051ba5ae06b0daf55e6b03b7531c369deb871d3d3579a86f3ca19f3ab71ccb45243f9 SHA512 e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3
 DIST firefox-128esr-patches-04.tar.xz 14416 BLAKE2B 0ffe3fd568480e37fe28fe71d5304e51028dcb8cb2d5fc1d838d725bdd36971696d7152c37bd90f7802c75e696aef0b1b075d386a906b40635f25083a6a58239 SHA512 adbac956dc2d6c1c29fb6641a42096bfd033a662f69e177f8d75a928f46d30fbc811e8a9ca24de8c7eb675ee80f6c1187f1a13dbca8e75782abfd54e276f5854
 DIST firefox-132-patches-02.tar.xz 14984 BLAKE2B 9ae56d19ba391bbc53a6babc72bf956c7bfda293aec52f5b1af3994238494d9c311e943593f6d8c2b89f7b24a50281f07248e684a6a6ec4a3f54ba1792125faf SHA512 9299d41830d91ebe558229149afbf66ade18f3925d5d30a603eec6115a16ce4d5e6c0a03193e0967ecad35fe4bfc1bc639f858a6df44372132541fd1aff149b3
+DIST firefox-132-patches-04.tar.xz 15164 BLAKE2B a485bd2f57220727ec4447def964d2fba0f2d3421e35644906dc20fdf5aa086d13952d4270b16a8268518ae21ff77c7e47c6093559b901c3542cc0e5bc1ced57 SHA512 1077439c4db0dbd7f415fcbb74a37d535483c1f9953c66770cbc4ed221f8e68c17d2cd897f3a07736924e9b17d18f2a1b8be6336b9e61a42dc69d54b7b469fcb
 DIST firefox-132.0.1-ach.xpi 467451 BLAKE2B cad4ed35bfd827d5e629cf478d46b85b9547728555aeccc684238caab763149eabed9771f05e4906923f1b7119190022e39e32fbe3ef0d41a95c1604a6582764 SHA512 6a1a50a19dbdc9198dd6336b53ca9e906a48e3f880d176a3e3d9b29559c0780868b18a2002c57dccaff901b651978c2cc6a4a7f3373dfe4a4ef77be630e0ebd3
 DIST firefox-132.0.1-af.xpi 420465 BLAKE2B 7b03a69f9f0181c196e3abf7e34d21c377d1fdf7f6b88c78b651447afbdfc73c8552185196dfc7d8c9228295c4db703a85e59646ff1aa134b7a5e66543c570f9 SHA512 b512c7a8f003733b1aea47ec3f7a85e91ece4cea381dc254da07a5cbc9c5dab0036d2fa11043754f97fa25dc112c545aac42c396c60cbfaa054119e0e053d9df
 DIST firefox-132.0.1-an.xpi 509134 BLAKE2B dfbf3a030c2e7771676828253d2f6afc0f8f3b03afbab29a2141941ebb3638eb7fd9bcab09c1500181e997f77394fb3dcc740bbdfc0794edb13d9a26f1765744 SHA512 401323ffd2319dc50e06b2e923971b8f14dfc99e3623d06f196069f015b46b7eacfdb21f6bd57d59125db1eca2be4409804f88ab2b0d682c2ef21b727beb4505
@@ -414,8 +415,10 @@ DIST firefox-132.0.2-xh.xpi 420611 BLAKE2B d4bcbd524706fcc5a75d94854f9890bc7ae90
 DIST firefox-132.0.2-zh-CN.xpi 676660 BLAKE2B 1887a9b7c49de2b8da5b30325b6d1b84e2b10fdddc90063cf0e84ecf39808ff0dab0ac5037456427b1c617e7d8c76bad3cafcbfc81d781be6232edf0f1d19c3f SHA512 bbbac92eec43da48674d2b693a19e8f1c839a08214971b7d90f1fc196165240cc9f1d723506146adecc4286b8b897a52332242a57c32a3e256018859169472ba
 DIST firefox-132.0.2-zh-TW.xpi 680268 BLAKE2B c421f438fec53fcc1851f076e0394a7ca5559511dd9d35da0ac85aabffa9acf57cfe00ff2174c83fe83e2a58c626bbff474591778b8ac18d0965e6524b9a07bc SHA512 65ed54c87a62ccd4253f115752f1c2d4d276156306624f2d24f010015dfbb0e26a5a18755bbb9d44124f5a0dd483a1819a72edcdd06f69b6ca67d50eefc87f0d
 DIST firefox-132.0.2.source.tar.xz 570535648 BLAKE2B d71b0e074ad2f299dc5b4291e9af012f54e52d71f029648aa4367a17227e7a9d4c22fc6ab3b834c4adc1c82e155a4cefeedce84f04045c56b03a0ca1689340a4 SHA512 9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae
+DIST wasi-sdk-24.0-arm64-linux.tar.gz 119660865 BLAKE2B 5067fe0d63a8be0e3466131a7f1e0a92185e09879e5256b8d12428606920fb074198d7c5b4f949466f5179852f53911333baf8fb2409068de4a9a6c4d62bbd96 SHA512 412df3d066ef4a175bc5a10353d4bf853c6aee101a024b84b2fc10c1e2a48c0dde1b7162c08a56726861a5b5b9838c05da75c5069d3454513ed862ba3f4629bc
+DIST wasi-sdk-24.0-x86_64-linux.tar.gz 118879731 BLAKE2B 385dced143f463427e48839b4c9a810161b2791f0a1a335ad53b1cff9e20fd004b1c24c80443ec213f448dc31a5b1748f447569161c88ca8fc01b3bf35421aa6 SHA512 e320e1d3965324dcc435aab15e0ec3597dae914fae9634af4e7181a76609d35fd01cdca07621f39a6c894b528055e2d014ce0c1fcfe23a154343f51fb48928bc
 EBUILD firefox-115.16.1-r1.ebuild 39187 BLAKE2B 2e708bb20394605304630e3b9e12b4dbfcaf9f300d6b60a182e943f4c7f19fb5a1996cd6c4a6216965b5c04309613b0e9cfc82053642cbdb0c9c25a034aed4c2 SHA512 184aa94944271de9c19a5ed6fa6a9af60ba25c14aabff66bcac9c1025ebd161d1ca060b2c05feabefba1c79e403f26c3817f9372031673f5c266234b922557cb
 EBUILD firefox-128.4.0-r1.ebuild 41094 BLAKE2B a15a88d0feb4c41f53751c30074811e6a9c2a3973d1ac799af1be8348663adc14b384e94ac8aa36ba5a08f19e832932296a8ada6f0acb425ec7e3452febf277b SHA512 80c52bfbd72ac30497c0d2a97191e1dab4ba3e9c4354be0659286c49cbfb35fcf2b144af163c528f68e5d32111b5d630efc377a09ca90efb516f62e9065e36fa
 EBUILD firefox-132.0.1-r1.ebuild 39383 BLAKE2B 2f52e771910992bdbe38ede5448affe7674d20794b05c3fc8002e2b8f3a522d99eb26a977e744067b95232a1b5303e2ee8daa879c74d6631fd6ad2397cf3b2dd SHA512 3124afe75ea942246679488164c66c6eba4517a78cbc32774a48ffe75692a60dfd1cb801f9739d3d1197bbd77f6b089a0fb630b2575ace8e466a82274f55410f
-EBUILD firefox-132.0.2.ebuild 39298 BLAKE2B bbf30ba8e37fa087ee47fb4db15fda2a72b623a13ada81a1492c4a665b5af6dd42d6f76cf9a56db8c96991b217f2e3645f1e7b5b0d084ea64a75480de30ea01c SHA512 6ab3e195c8c85a5a267f064504d2c34ee8fdba5ac4cb9a896b0757fbda6a44739d30850de699c01e850f59e3acfe135e337efcf9532161d704877cfa5a574e90
-MISC metadata.xml 2675 BLAKE2B 57721fdb9b8e0f1ea4a7d96dc284d5bc2f02e486086778bcb56f1a6166e327c4a06766cc4f2a7dd3716eef352c78ae28659971d9c71880d3ab22524ff060f57c SHA512 e0331f26da3dfa53b5f5c3b68e1f19b02dff662bc70bf4275d55edc077a508ac26be031f8693000fc903ea84c637cfc656358aa8f20f42747dd9a6994df6d724
+EBUILD firefox-132.0.2.ebuild 40495 BLAKE2B 2deda0a2356d0c7ece91eefbdb7029ffb3f28f4fb8d506daff1c5c476c9aaf222cf9c697defbd13aab59310314b6b840e7f93772234bacc5d21205fdd078dae8 SHA512 9c8c45a97e7222ef01a407b1f8939561a36ef82919a2d39debc134f91f8bb475ed5383ad640ead7939678c65943961443d9af3b29df7bd658e6484502b794da8
+MISC metadata.xml 2785 BLAKE2B f598ed0bb1c1b4473a59f171898fb5e4d1872b175705662e8801d936b32ba609c1e2e657d235329b0fce7642ac8eb97612876244a029a5ac5b0a6cd17db153ec SHA512 a47f3e4336381bb388906ca826b09210dd20bf7a19e4395d6cedc1675b30b89b40820fe22a424abcc8e725c412f5bdc18067450198935c2edbd8c276e050d27f
diff --git a/www-client/firefox/firefox-132.0.2.ebuild b/www-client/firefox/firefox-132.0.2.ebuild
index 339d343491f9..d20c7fd48226 100644
--- a/www-client/firefox/firefox-132.0.2.ebuild
+++ b/www-client/firefox/firefox-132.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-132-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-132-patches-04.tar.xz"
 
 LLVM_COMPAT=( 17 18 19 )
 
@@ -20,6 +20,11 @@ WANT_AUTOCONF="2.1"
 
 VIRTUALX_REQUIRED="manual"
 
+# Information about the bundled wasm toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=24.0
+WASI_SDK_LLVM_VER=18
+
 MOZ_ESR=
 
 MOZ_PV=${PV}
@@ -63,7 +68,12 @@ PATCH_URIS=(
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
+	${PATCH_URIS[@]}
+	wasm? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+
 S="${WORKDIR}/${PN}-${PV%_*}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
@@ -74,7 +84,7 @@ IUSE+=" +system-jpeg +system-libevent +system-libvpx system-png +system-webp val
 IUSE+=" wifi +X"
 
 # Firefox-only IUSE
-IUSE+=" +gmp-autoupdate gnome-shell +telemetry"
+IUSE+=" +gmp-autoupdate gnome-shell +telemetry wasm"
 
 REQUIRED_USE="|| ( X wayland )
 	debug? ( !system-av1 )
@@ -224,13 +234,13 @@ llvm_check_deps() {
 			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 			return 1
 		fi
+	fi
 
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
-				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
+	if use pgo ; then
+		if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
 		fi
 	fi
 
@@ -609,10 +619,28 @@ src_prepare() {
 		elif use ppc64 ; then
 			export RUST_TARGET="powerpc64le-unknown-linux-musl"
 		else
-			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
 		fi
 	fi
 
+	# Pre-built wasm path manipulation.
+	if use wasm ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
 	# Make LTO respect MAKEOPTS
 	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
 		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
@@ -778,7 +806,6 @@ src_configure() {
 		--prefix="${EPREFIX}/usr" \
 		--target="${CHOST}" \
 		--without-ccache \
-		--without-wasm-sandboxed-libraries \
 		--with-intl-api \
 		--with-libclang-path="$(llvm-config --libdir)" \
 		--with-system-nspr \
@@ -852,7 +879,6 @@ src_configure() {
 
 	mozconfig_use_with system-av1
 	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
 	mozconfig_use_with system-icu
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-libevent
@@ -894,6 +920,16 @@ src_configure() {
 		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
 	fi
 
+	# wasm
+	# +system-graphite2 doesn't currently play nice with wasm.
+	if use wasm ; then
+		mozconfig_add_options_ac '+wasm' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+
 	if [[ ${use_lto} == "yes" ]] ; then
 		if use clang ; then
 			# Upstream only supports lld or mold when using clang.
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 2e477393e06d..a24bfdb7d8de 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -25,7 +25,7 @@
 	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
 		and <pkg>media-libs/libaom</pkg> library instead of bundled</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
-		and <pkg>media-gfx/graphite2</pkg> instead of bundled</flag>
+		instead of bundled and <pkg>media-gfx/graphite2</pkg> in most cases</flag>
 	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
 		instead of bundled</flag>
 	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
@@ -39,6 +39,7 @@
 	<flag name="system-python-libs">Use system's python site instead of bundled python libraries</flag>
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled</flag>
+	<flag name="wasm">Sandbox certain third-party libraries through WebAssembly using RLBox</flag>
 	<flag name="wifi">Enable necko-wifi for NetworkManager integration, and access point MAC
 		address scanning for better precision with opt-in geolocation services</flag>
 </use>