Le Thu, May 14, 2026 at 10:42:13PM +0200, Caspar Schutijser a écrit :
> Hey Landry,
>
> Perhaps I'm doing something wrong but downloading
> bug-2038504-backport-bug-D262840-to-esr140.patch fails for me. Is it
> hosted elsewhere?
my bad, i had created it locally in /usr/ports/distfiles/mozilla/ and
forgot to upload it to bugzilla..
the only different line would be
PATCHFILES.p=
bug-2038504-backport-bug-D262840-to-esr140.patch{attachment.cgi?id=9585442}
new diff attached only for esr, and i also locally have a humongous
adapted diff for thunderbird, so with tor-browser that's all the
consumers of the wasi stack covered/able to move to llvm22.
Landry
? 140.10.2-llvm20
? 140.10.2-llvm21
? allbuilds.log
? fail-llvm22
? logs
? notes-clang19.txt
? patch-js_xpconnect_src_xpcpublic_h
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
diff -u -r1.272 Makefile
--- Makefile 8 May 2026 18:24:40 -0000 1.272
+++ Makefile 15 May 2026 06:11:07 -0000
@@ -24,16 +24,23 @@
MODPY_RUNDEP = No
+# jumbo patch to update bindgen to a llvm22-compatible version
+SITES.p = https://bugzilla.mozilla.org/
+PATCHFILES.p=
bug-2038504-backport-bug-D262840-to-esr140.patch{attachment.cgi?id=9585442}
+PATCH_DIST_STRIP = -p1 -f
+
COMPILER = ports-clang
+MODCLANG_VERSION = 22
+USE_LLD = ports
# 63 requires node because why not #1483595
BUILD_DEPENDS += lang/node
# 63 requires cbindgen #1478813
BUILD_DEPENDS += devel/cbindgen>=0.23.0
# wasi
-BUILD_DEPENDS += lang/wasi-sdk/compiler-rt \
- lang/wasi-sdk/libcxx \
- lang/wasi-libc
+BUILD_DEPENDS += lang/wasi-sdk/compiler-rt,llvm22 \
+ lang/wasi-sdk/libcxx,llvm22 \
+ lang/wasi-libc,llvm22
# mach uses pkg_resources
BUILD_DEPENDS += devel/py-setuptools
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/firefox-esr/distinfo,v
diff -u -r1.182 distinfo
--- distinfo 8 May 2026 18:24:40 -0000 1.182
+++ distinfo 15 May 2026 06:11:07 -0000
@@ -1,4 +1,6 @@
+SHA256 (mozilla/bug-2038504-backport-bug-D262840-to-esr140.patch) =
zpr2OT4BsxJzYMxddtYfqxuIM1xxa8xOR5orDPSo2jA=
SHA256 (mozilla/firefox-140.10.2esr.source-profdata.tar.xz) =
o3NC9nHV0t91M0oyI/xEKwzr8chluaA5TXncJHbmlwA=
SHA256 (mozilla/firefox-140.10.2esr.source.tar.xz) =
eWv2U3LnAsEyd+bzjpJ23tnc7qgeiTTCmgZWgBbyTnc=
+SIZE (mozilla/bug-2038504-backport-bug-D262840-to-esr140.patch) = 606640
SIZE (mozilla/firefox-140.10.2esr.source-profdata.tar.xz) = 17204388
SIZE (mozilla/firefox-140.10.2esr.source.tar.xz) = 638783848
Index: patches/patch-Cargo_lock
===================================================================
RCS file: patches/patch-Cargo_lock
diff -N patches/patch-Cargo_lock
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Cargo_lock 15 May 2026 06:11:07 -0000
@@ -0,0 +1,212 @@
+regenerated cargo.lock on top of the jumbo patch
+
+Index: Cargo.lock
+--- Cargo.lock.orig
++++ Cargo.lock
+@@ -973,7 +973,7 @@ dependencies = [
+ [[package]]
+ name = "context_id"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "chrono",
+ "error-support",
+@@ -1913,7 +1913,7 @@ dependencies = [
+ [[package]]
+ name = "error-support"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "env_logger",
+ "error-support-macros",
+@@ -1926,7 +1926,7 @@ dependencies = [
+ [[package]]
+ name = "error-support-macros"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "proc-macro2",
+ "quote",
+@@ -2045,7 +2045,7 @@ dependencies = [
+ [[package]]
+ name = "firefox-versioning"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "serde_json",
+ "thiserror 1.999.999",
+@@ -3386,7 +3386,7 @@ dependencies = [
+ [[package]]
+ name = "interrupt-support"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "lazy_static",
+ "parking_lot",
+@@ -5108,7 +5108,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dea
+ [[package]]
+ name = "payload-support"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "serde",
+ "serde_derive",
+@@ -5615,7 +5615,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb
+ [[package]]
+ name = "relevancy"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "base64 0.21.999",
+@@ -5639,7 +5639,7 @@ dependencies = [
+ [[package]]
+ name = "remote_settings"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "camino",
+@@ -5940,7 +5940,7 @@ dependencies = [
+ [[package]]
+ name = "search"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "error-support",
+ "firefox-versioning",
+@@ -6232,7 +6232,7 @@ dependencies = [
+ [[package]]
+ name = "sql-support"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "error-support",
+ "interrupt-support",
+@@ -6431,7 +6431,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99
+ [[package]]
+ name = "suggest"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "chrono",
+@@ -6484,7 +6484,7 @@ dependencies = [
+ [[package]]
+ name = "sync-guid"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "base64 0.21.999",
+ "rand",
+@@ -6495,7 +6495,7 @@ dependencies = [
+ [[package]]
+ name = "sync15"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "error-support",
+@@ -6534,7 +6534,7 @@ dependencies = [
+ [[package]]
+ name = "tabs"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "error-support",
+@@ -6892,7 +6892,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06
+ [[package]]
+ name = "types"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "rusqlite 0.33.0",
+ "serde",
+@@ -7304,7 +7304,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc
+ [[package]]
+ name = "viaduct"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "error-support",
+ "ffi-support",
+@@ -7473,7 +7473,7 @@ dependencies = [
+ [[package]]
+ name = "webext-storage"
+ version = "0.1.0"
+-source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+ "anyhow",
+ "error-support",
+@@ -8143,3 +8143,53 @@ name = "zlib-rs"
+ version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ checksum = "8b20717f0917c908dc63de2e44e97f1e6b126ca58d0e391cee86d504eb8fbd05"
++
++[[patch.unused]]
++name = "context_id"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "interrupt-support"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "relevancy"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "search"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "sql-support"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "suggest"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "sync15"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "tabs"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "viaduct"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
++
++[[patch.unused]]
++name = "webext-storage"
++version = "0.1.0"
++source =
"git+https://github.com/mozilla/application-services?rev=f5907a411e52a3985d0369d71c486eb507c2c4e6#f5907a411e52a3985d0369d71c486eb507c2c4e6";
Index: patches/patch-build_moz_configure_toolchain_configure
===================================================================
RCS file: patches/patch-build_moz_configure_toolchain_configure
diff -N patches/patch-build_moz_configure_toolchain_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_moz_configure_toolchain_configure 15 May 2026
06:11:07 -0000
@@ -0,0 +1,14 @@
+allow building with a wasi stack built with llvm22
+
+adapted from https://hg-edge.mozilla.org/mozilla-central/rev/b1b4f0d7ed12
+--- build/moz.configure/toolchain.configure.orig
++++ build/moz.configure/toolchain.configure
+@@ -1122,7 +1122,7 @@ def compiler_wrapper(wrapper, ccache):
+
+ @dependable
+ def wasm():
+- return split_triplet("wasm32-wasi", allow_wasi=True)
++ return split_triplet("wasm32-wasip1", allow_wasi=True)
+
+
+ @template
Index: patches/patch-gfx_skia_skia_modules_skcms_src_Transform_inl_h
===================================================================
RCS file: patches/patch-gfx_skia_skia_modules_skcms_src_Transform_inl_h
diff -N patches/patch-gfx_skia_skia_modules_skcms_src_Transform_inl_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gfx_skia_skia_modules_skcms_src_Transform_inl_h 15 May
2026 06:11:07 -0000
@@ -0,0 +1,20 @@
+fix build with llvm22
+
+from https://skia-review.googlesource.com/c/skcms/+/1038217
+via
https://aur.archlinux.org/cgit/aur.git/commit/?h=aseprite&id=2b4cdcbce785668eecd2d8aa2ccfbc21a7147d2a
+
+applied in 146 via https://phabricator.services.mozilla.com/D269642
+Index: gfx/skia/skia/modules/skcms/src/Transform_inl.h
+--- gfx/skia/skia/modules/skcms/src/Transform_inl.h.orig
++++ gfx/skia/skia/modules/skcms/src/Transform_inl.h
+@@ -156,8 +156,8 @@ SI F F_from_Half(U16 half) {
+ #elif defined(USING_AVX512F)
+ return (F)_mm512_cvtph_ps((__m256i)half);
+ #elif defined(USING_AVX_F16C)
+- typedef int16_t __attribute__((vector_size(16))) I16;
+- return __builtin_ia32_vcvtph2ps256((I16)half);
++ typedef _Float16 __attribute__((vector_size(16))) F16;
++ return __builtin_convertvector((F16)half, F);
+ #else
+ U32 wide = cast<U32>(half);
+ // A half is 1-5-10 sign-exponent-mantissa, with 15 exponent bias.
Index: patches/patch-third_party_rust_ohttp_Cargo_toml
===================================================================
RCS file: patches/patch-third_party_rust_ohttp_Cargo_toml
diff -N patches/patch-third_party_rust_ohttp_Cargo_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third_party_rust_ohttp_Cargo_toml 15 May 2026 06:11:07
-0000
@@ -0,0 +1,18 @@
+bump dependency on bindgen for llvm22, 0.64 was removed from the toplevel
Cargo.lock
+
+should be harmless,
+cf
https://github.com/martinthomson/ohttp/commit/a2335b2e7ffb6805206bf8f59a5f60b9e6f98bb4
+and
https://github.com/martinthomson/ohttp/commit/bf6a983845cc0b540effb3a615e92d914dfcfd0b
+
+Index: third_party/rust/ohttp/Cargo.toml
+--- third_party/rust/ohttp/Cargo.toml.orig
++++ third_party/rust/ohttp/Cargo.toml
+@@ -86,7 +86,7 @@ version = "0.9"
+ default-features = false
+
+ [build-dependencies.bindgen]
+-version = "0.64"
++version = "0.69"
+ features = ["runtime"]
+ optional = true
+ default-features = false
Index: patches/patch-third_party_rust_ohttp__cargo-checksum_json
===================================================================
RCS file: patches/patch-third_party_rust_ohttp__cargo-checksum_json
diff -N patches/patch-third_party_rust_ohttp__cargo-checksum_json
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third_party_rust_ohttp__cargo-checksum_json 15 May 2026
06:11:07 -0000
@@ -0,0 +1,7 @@
+Index: third_party/rust/ohttp/.cargo-checksum.json
+--- third_party/rust/ohttp/.cargo-checksum.json.orig
++++ third_party/rust/ohttp/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"f93723973762c48df66c9e2125da726559e9bc0bf5ed38fb4e776af3381502fc","README.md":"a97309a7b0c65dbcbd43e6c64bf99e023cd07e9d3de5c4559f33db430edafebd","bindings/bindings.toml":"a016870127b63151e760c964d687934a4883ee165bdd9718341c8dd50be5a3f2","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nss_init.h":"cd4dffd0c629ece5786736dd6d26db8a96f56fd56ef95b150c623c41080c2f9e","bindings/nss_p11.h":"a16f60d0210d5823f2d92d0c04988a0bb1da85901388490cb3e755a62cc7d5dd","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","build.rs":"75f7bc67d2757bf68f1ba64258a7a7db4b94de5403936b73d8140e9558c30698","src/config.rs":"d39a765f561423f320e0be8c6aaabf3c3fb85248468b345aa43f778974280945","src/err.rs":"533b382c7e74906521395fdff4b514981535fe1b45b307528c547bb545765adf","src/hpke.rs":"b98b3a1d2e87bd89d43d89e2513e2d3211832aef3fd2157337939186aa7c8531","src/lib.rs":"bfc972343aa3fa6707b0aaea04c25f1b6fa2ff3f9e9761ae6a09f9be52fce214","src/nss/aead.rs":"01b3b1654a310a276edb5750d2d0e3ee14943f8695f413d176b65623369d81be","src/nss/err.rs":"d367116bf9840ebe06d358066a1755f7d9936438dbc2e4e71a6b345d05e4bcd5","src/nss/hkdf.rs":"d70147f27be9defcb2cd67da9e49a4f09adecd0a2ebad646eae94d09512b1b0b","src/nss/hpke.rs":"cbd353d2f0c8db82fcf25dac2f2d2554e8a6258c4b21e0279e618fb2f992c49c","src/nss/mod.rs":"bca4b6fcc807b7b146989fe500c0e5b249ddfcaff1a795cc8b84a70631b50a60","src/nss/p11.rs":"1761896f0359c37cd186e34daaf1b582e907a123fe987b937c314f7b2cecc9de","src/rand.rs":"be3a82fb6090b5cb833c2b8ba6e72690b9f44f7f91477e2c5b70b75623174b87","src/rh/aead.rs":"88dd43ffec20a8870a424d27dbda0a9db74f4b3d1b03097220854a304ab091cd","src/rh/hkdf.rs":"4c6e59ca24498939e9b8da2da6336ae2f62396101f1b9b25f1ae587ab21c1a9d","src/rh/hpke.rs":"8d7de700e48bf4f6a711e6c5df1eb4a7ae7d33c65d75728e9d1c8c797f474e7a","src/rh/mod.rs":"d6045628f9b95d75e8bfcc30d55b1fc8b5ea9e2a4c45e20102f4f33c0b711a0c"},"package":"578cb11a3fb5c85697ed8bb850d5ad1cbf819d3eea05c2b253cf1d240fbb10c5"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"b4e82a5328b20cfa842341dcdecd6accd60f2bdaa288fe8c638242e097cafbd2","README.md":"a97309a7b0c65dbcbd43e6c64bf99e023cd07e9d3de5c4559f33db430edafebd","bindings/bindings.toml":"a016870127b63151e760c964d687934a4883ee165bdd9718341c8dd50be5a3f2","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nss_init.h":"cd4dffd0c629ece5786736dd6d26db8a96f56fd56ef95b150c623c41080c2f9e","bindings/nss_p11.h":"a16f60d0210d5823f2d92d0c04988a0bb1da85901388490cb3e755a62cc7d5dd","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","build.rs":"75f7bc67d2757bf68f1ba64258a7a7db4b94de5403936b73d8140e9558c30698","src/config.rs":"d39a765f561423f320e0be8c6aaabf3c3fb85248468b345aa43f778974280945","src/err.rs":"533b382c7e74906521395fdff4b514981535fe1b45b307528c547bb545765adf","src/hpke.rs":"b98b3a1d2e87bd89d43d89e2513e2d3211832aef3fd2157337939186aa7c8531","src/lib.rs":"bfc972343aa3fa6707b0aaea04c25f1b6fa2ff3f9e9761ae6a09f9be52fce214","src/nss/aead.rs":"01b3b1654a310a276edb5750d2d0e3ee14943f8695f413d176b65623369d81be","src/nss/err.rs":"d367116bf9840ebe06d358066a1755f7d9936438dbc2e4e71a6b345d05e4bcd5","src/nss/hkdf.rs":"d70147f27be9defcb2cd67da9e49a4f09adecd0a2ebad646eae94d09512b1b0b","src/nss/hpke.rs":"cbd353d2f0c8db82fcf25dac2f2d2554e8a6258c4b21e0279e618fb2f992c49c","src/nss/mod.rs":"bca4b6fcc807b7b146989fe500c0e5b249ddfcaff1a795cc8b84a70631b50a60","src/nss/p11.rs":"1761896f0359c37cd186e34daaf1b582e907a123fe987b937c314f7b2cecc9de","src/rand.rs":"be3a82fb6090b5cb833c2b8ba6e72690b9f44f7f91477e2c5b70b75623174b87","src/rh/aead.rs":"88dd43ffec20a8870a424d27dbda0a9db74f4b3d1b03097220854a304ab091cd","src/rh/hkdf.rs":"4c6e59ca24498939e9b8da2da6336ae2f62396101f1b9b25f1ae587ab21c1a9d","src/rh/hpke.rs":"8d7de700e48bf4f6a711e6c5df1eb4a7ae7d33c65d75728e9d1c8c797f474e7a","src/rh/mod.rs":"d6045628f9b95d75e8bfcc30d55b1fc8b5ea9e2a4c45e20102f4f33c0b711a0c"},"package":"578cb11a3fb5c85697ed8bb850d5ad1cbf819d3eea05c2b253cf1d240fbb10c5"}
Index: patches/patch-tools_profiler_rust-api_build_rs
===================================================================
RCS file: patches/patch-tools_profiler_rust-api_build_rs
diff -N patches/patch-tools_profiler_rust-api_build_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_profiler_rust-api_build_rs 15 May 2026 06:11:07
-0000
@@ -0,0 +1,15 @@
+fix on top of jumbo patch
+
+cf https://bugzilla.mozilla.org/show_bug.cgi?id=2038504#c14
+
+Index: tools/profiler/rust-api/build.rs
+--- tools/profiler/rust-api/build.rs.orig
++++ tools/profiler/rust-api/build.rs
+@@ -90,6 +90,7 @@ fn generate_bindings() {
+ .opaque_type("std::string")
+ .opaque_type("std::unique_ptr")
+ .opaque_type("mozilla::Maybe")
++ .opaque_type("mozilla::UniquePtr")
+ .opaque_type("mozilla::MallocAllocPolicy")
+ .opaque_type("mozilla::Variant")
+ .opaque_type("mozilla::baseprofiler::UniqueJSONStrings")
