diff --git a/mail-client/icedove/icedove-141.0.recipe b/mail-client/icedove/icedove-146.0.1.recipe similarity index 94% rename from mail-client/icedove/icedove-141.0.recipe rename to mail-client/icedove/icedove-146.0.1.recipe index 8b3e7c17a..2de448a86 100644 --- a/mail-client/icedove/icedove-141.0.recipe +++ b/mail-client/icedove/icedove-146.0.1.recipe @@ -8,7 +8,7 @@ COPYRIGHT="1998–2025 MZLA Technologies Corporation," LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://ftp.mozilla.org/pub/thunderbird/releases/$portVersion/source/thunderbird-$portVersion.source.tar.xz" -CHECKSUM_SHA256="694a6b11f8afa9ff2b0899f1f59473160b3a92be271892df8c2f6bb748fb4666" +CHECKSUM_SHA256="816c7add658c208ef6057ef86643ed9ecc0f4daafcae592a1ffe38d1a2108b38" SOURCE_DIR="thunderbird-$portVersion" PATCHES=" icedove_launcher-$portVersion.patchset @@ -88,7 +88,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:nasm cmd:perl - cmd:pip3 cmd:pkg_config cmd:python3 cmd:tar @@ -109,8 +108,11 @@ BUILD() build/cargo-linker \ mach - export DISABLE_ASLR=1 +# export DISABLE_ASLR=1 export MOZBUILD_STATE_PATH="$sourceDir/.mozconfig" + export RUSTFLAGS="-C link-arg=-Wl,--no-gc-sections" + + python3 -m ensurepip --default-pip ./mach -vv \ --no-interactive bootstrap \ @@ -168,7 +170,7 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.icedove" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="0" + local MINOR="`echo "$portVersion" | cut -d. -f3`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ diff --git a/mail-client/icedove/patches/icedove-141.0.patchset b/mail-client/icedove/patches/icedove-146.0.1.patchset similarity index 91% rename from mail-client/icedove/patches/icedove-141.0.patchset rename to mail-client/icedove/patches/icedove-146.0.1.patchset index ca74c10d1..727f8f362 100644 --- a/mail-client/icedove/patches/icedove-141.0.patchset +++ b/mail-client/icedove/patches/icedove-146.0.1.patchset @@ -1,6 +1,6 @@ -From fb594a491c83faf0bce4091a5a6ad5f0a943632f Mon Sep 17 00:00:00 2001 +From a2d417e7ccb9cb035079cff89f3e320efb984fe5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 9 May 2025 20:09:43 +1000 +Date: Wed, 31 Dec 2025 20:17:36 +1000 Subject: Add Haiku build support Based on patches sourced from https://github.com/kenz-gelsoft/gecko-dev/ @@ -12,7 +12,7 @@ Based on patches sourced from https://github.com/kenz-gelsoft/gecko-dev/ - Implement remote server diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 4050c00..817df25 100644 +index c5e3248..5cbbcbc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -15,7 +15,9 @@ @@ -26,16 +26,16 @@ index 4050c00..817df25 100644 #endif #endif -@@ -264,7 +266,7 @@ pref("browser.fixup.domainsuffixwhitelist.local", true); - // search string, that may contain a valid host, to a search engine. - pref("browser.fixup.dns_first_for_single_words", false); +@@ -244,7 +246,7 @@ pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/t + // How long to show a Hearbeat survey (two hours, in seconds) + pref("browser.uitour.surveyDuration", 7200); -#ifdef UNIX_BUT_NOT_MAC +#ifdef UNIX_BUT_NOT_MAC_NOR_HAIKU pref("general.autoScroll", false); #else pref("general.autoScroll", true); -@@ -1034,7 +1036,7 @@ pref("security.allow_parent_unrestricted_js_loads", false); +@@ -1112,7 +1114,7 @@ pref("browser.unexpectedScriptLoad.logLevel", "Warn"); pref("browser.tabs.min_inactive_duration_before_unload", 600000); // Does middleclick paste of clipboard to new tab button @@ -45,7 +45,7 @@ index 4050c00..817df25 100644 #else pref("browser.tabs.searchclipboardfor.middleclick", false); diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc -index 2e76540..e3bc0dd 100644 +index 8d97b6e..180001f 100644 --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -6,6 +6,12 @@ @@ -61,7 +61,7 @@ index 2e76540..e3bc0dd 100644 #endif #endif -@@ -201,7 +207,7 @@ +@@ -202,7 +208,7 @@ @@ -70,7 +70,7 @@ index 2e76540..e3bc0dd 100644 #else -@@ -346,10 +352,14 @@ +@@ -347,10 +353,14 @@ #ifdef XP_GNOME @@ -100,7 +100,7 @@ index af2fc4f..e61403a 100644 LIBRARY_DEFINES["MOZ_HAS_MOZGLUE"] = True if not CONFIG["MOZ_GLUE_IN_PROGRAM"]: diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure -index af5a0cd..1d6be80 100644 +index 8cb11d4..6519a57 100644 --- a/build/moz.configure/bindgen.configure +++ b/build/moz.configure/bindgen.configure @@ -203,7 +203,7 @@ def bindgen_libclang_path(libclang_path, clang, library_name_info, host): @@ -113,7 +113,7 @@ index af5a0cd..1d6be80 100644 if host.os == "OpenBSD": diff --git a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure -index f0f4d7a..297718d 100644 +index 302505d..b7bb16b 100644 --- a/build/moz.configure/flags.configure +++ b/build/moz.configure/flags.configure @@ -520,7 +520,7 @@ set_config("EXPAND_LIBS_LIST_STYLE", expand_libs_list_style) @@ -126,10 +126,10 @@ index f0f4d7a..297718d 100644 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 6162d68..3b8adad 100644 +index 892faaf..e4e50bf 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -507,6 +507,8 @@ def split_triplet(triplet, allow_wasi=False): +@@ -519,6 +519,8 @@ def split_triplet(triplet, allow_wasi=False): canonical_os = canonical_kernel = "DragonFly" elif os.startswith("freebsd"): canonical_os = canonical_kernel = "FreeBSD" @@ -138,7 +138,7 @@ index 6162d68..3b8adad 100644 elif os.startswith("netbsd"): canonical_os = canonical_kernel = "NetBSD" elif os.startswith("openbsd"): -@@ -935,6 +937,15 @@ def target_is_freebsd(target): +@@ -947,6 +949,15 @@ def target_is_freebsd(target): set_define("XP_FREEBSD", target_is_freebsd) @@ -155,10 +155,10 @@ index 6162d68..3b8adad 100644 def target_is_solaris(target): if target.kernel == "SunOS": diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index cc42c12..c3fda1b 100644 +index 3d8d2ea..c4ad7fb 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -2961,7 +2961,7 @@ def security_hardening_cflags( +@@ -2905,7 +2905,7 @@ def security_hardening_cflags( if ( c_compiler.type == "clang" and c_compiler.version >= "11.0.1" @@ -168,7 +168,7 @@ index cc42c12..c3fda1b 100644 ): flags.append("-fstack-clash-protection") diff --git a/comm/mail/modules/DNS.worker.mjs b/comm/mail/modules/DNS.worker.mjs -index d5e227f..0527b90 100644 +index 6198d30..f5693cc 100644 --- a/comm/mail/modules/DNS.worker.mjs +++ b/comm/mail/modules/DNS.worker.mjs @@ -39,6 +39,8 @@ class load_libresolv { @@ -506,18 +506,18 @@ index 01741d0..5f34a5d 100644 # else # define MDB_USE_ROBUST 1 diff --git a/comm/third_party/rust/mtu/.cargo-checksum.json b/comm/third_party/rust/mtu/.cargo-checksum.json -index 599d7cd..75e325a 100644 +index bfdbeeb..cba6867 100644 --- a/comm/third_party/rust/mtu/.cargo-checksum.json +++ b/comm/third_party/rust/mtu/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"CODE_OF_CONDUCT.md":"f7b4cba1deaa0a77bd611c04c84ef5b6859e44c8370f7513fe688fb9531b913b","Cargo.lock":"0d7b4f80f302400b5fba9847542ab3a0e94dd50bb0d27111927a6e4037b42eef","Cargo.toml":"82ab8662dd7a9c324bd23a7234fa2b8d6df9a9cab2b9baa778039bb55666bfb8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"2c9cce2eb06f0897e9b2fb68d8fa640da581bf440c26f266f8af5b3edb02dc6a","SECURITY.md":"75455814b6cf997e22a927eb979b4356d788583aa1eb96e90853aaab0f82ad1b","build.rs":"c26ac0385171924eefec5ce864067419bb023961b054abaf060d8da567dc6241","src/bsd.rs":"e680ddb399419bb67219fa1c0d3e6672d32023f325584869bd050e2f2ecc8ff9","src/lib.rs":"a59ae67763bc6bb9e6a4f7e7af61fed722ca032b667276a68e6ad687f1fe1e6e","src/linux.rs":"4e99612a04d744e2ca22b2e353faa500b37cb58caddaecb7566b4748aa1f7209","src/routesocket.rs":"be837947e2c3f9301a174499217fe8920ff492918bf85ca5eb281eb7ad2240e1","src/windows.rs":"b139c7aaa0c39415ce1773f1c9569be1a6b82dfe82334ab0c6cb80e7d232363e"},"package":"4c30d3771729ec4349aae3b1a7c0b6b4a1500459e60b1fda95fe0657c3711574"} +-{"files":{".clippy.toml":"6ab1a673bd5c7ba29bd77e62f42183db3ace327c23d446d5b4b0618f6c39d639","Cargo.toml":"b4c4826e5e748da588a67852184dac53e76fe3f31f1b1eb7bb390808688103a5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"24df0e24154b7f0096570ad221aea02bd53a0f1124a2adafff5730af5443a65c","SECURITY.md":"75455814b6cf997e22a927eb979b4356d788583aa1eb96e90853aaab0f82ad1b","build.rs":"a4bcd0562c80914a8e909e8b10507605bfd6f0f268fad9ef4d79f4c48bdaed6c","src/bsd.rs":"7641b2a905a5e05505507fdf2e3af37e9c901a997d48759258f9f853cd2ab0e5","src/lib.rs":"6e8702d77e0f211d05862820eec77f2aa8cd8db6ec4de2c5278d223fbd96b31d","src/linux.rs":"aecc6acbea2419dd6cc31e916148e438d8cec20cf001758042299ff2ccc81d39","src/routesocket.rs":"be837947e2c3f9301a174499217fe8920ff492918bf85ca5eb281eb7ad2240e1","src/windows.rs":"d7e18d55b3be5462d2041fc22fb22cf1fc163ec30b107a3274f2bd22ad618411"},"package":null} \ No newline at end of file -+{"files":{"CODE_OF_CONDUCT.md":"f7b4cba1deaa0a77bd611c04c84ef5b6859e44c8370f7513fe688fb9531b913b","Cargo.lock":"0d7b4f80f302400b5fba9847542ab3a0e94dd50bb0d27111927a6e4037b42eef","Cargo.toml":"82ab8662dd7a9c324bd23a7234fa2b8d6df9a9cab2b9baa778039bb55666bfb8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"2c9cce2eb06f0897e9b2fb68d8fa640da581bf440c26f266f8af5b3edb02dc6a","SECURITY.md":"75455814b6cf997e22a927eb979b4356d788583aa1eb96e90853aaab0f82ad1b","build.rs":"53cdf0272c2aed57fd5827d75a08542c0cdbaed0a4d209450404e3c3d8ba73c0","src/bsd.rs":"e680ddb399419bb67219fa1c0d3e6672d32023f325584869bd050e2f2ecc8ff9","src/lib.rs":"e12374910adce285b092808ea2254cd5294ea8d8aec6c8c8998cee1b01df4ee4","src/linux.rs":"4e99612a04d744e2ca22b2e353faa500b37cb58caddaecb7566b4748aa1f7209","src/routesocket.rs":"be837947e2c3f9301a174499217fe8920ff492918bf85ca5eb281eb7ad2240e1","src/windows.rs":"b139c7aaa0c39415ce1773f1c9569be1a6b82dfe82334ab0c6cb80e7d232363e"},"package":"4c30d3771729ec4349aae3b1a7c0b6b4a1500459e60b1fda95fe0657c3711574"} ++{"files":{".clippy.toml":"6ab1a673bd5c7ba29bd77e62f42183db3ace327c23d446d5b4b0618f6c39d639","Cargo.toml":"b4c4826e5e748da588a67852184dac53e76fe3f31f1b1eb7bb390808688103a5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"24df0e24154b7f0096570ad221aea02bd53a0f1124a2adafff5730af5443a65c","SECURITY.md":"75455814b6cf997e22a927eb979b4356d788583aa1eb96e90853aaab0f82ad1b","build.rs":"c265722d7e536d1c0103e484d1e805df24a0a2a514c8aa7052088202635ba33d","src/bsd.rs":"7641b2a905a5e05505507fdf2e3af37e9c901a997d48759258f9f853cd2ab0e5","src/lib.rs":"cf234181f68c5735c3ee0d9bfb99fb43ca7d9b574795c7cc8fa4e4cfdd5109ee","src/linux.rs":"aecc6acbea2419dd6cc31e916148e438d8cec20cf001758042299ff2ccc81d39","src/routesocket.rs":"be837947e2c3f9301a174499217fe8920ff492918bf85ca5eb281eb7ad2240e1","src/windows.rs":"d7e18d55b3be5462d2041fc22fb22cf1fc163ec30b107a3274f2bd22ad618411"},"package":null} diff --git a/comm/third_party/rust/mtu/build.rs b/comm/third_party/rust/mtu/build.rs -index fdd7366..165ab18 100644 +index a649819..2392d6f 100644 --- a/comm/third_party/rust/mtu/build.rs +++ b/comm/third_party/rust/mtu/build.rs -@@ -47,7 +47,7 @@ fn bindgen() { +@@ -40,7 +40,7 @@ fn bindgen() { // Platforms currently not supported. // // See . @@ -527,10 +527,10 @@ index fdd7366..165ab18 100644 } diff --git a/comm/third_party/rust/mtu/src/lib.rs b/comm/third_party/rust/mtu/src/lib.rs -index 14fcc2a..104cef6 100644 +index 81dc869..06d2f4f 100644 --- a/comm/third_party/rust/mtu/src/lib.rs +++ b/comm/third_party/rust/mtu/src/lib.rs -@@ -101,7 +101,7 @@ const fn aligned_by(size: usize, align: usize) -> usize { +@@ -110,7 +110,7 @@ const fn aligned_by(size: usize, align: usize) -> usize { // Platforms currently not supported. // // See . @@ -540,15 +540,15 @@ index 14fcc2a..104cef6 100644 return Err(default_err()); } diff --git a/comm/third_party/rust/quinn-udp/.cargo-checksum.json b/comm/third_party/rust/quinn-udp/.cargo-checksum.json -index 2ada89f..33a4a07 100644 +index a23c804..9236df3 100644 --- a/comm/third_party/rust/quinn-udp/.cargo-checksum.json +++ b/comm/third_party/rust/quinn-udp/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.lock":"b6db9f61ff4fdb22fb4a928df627f66d2a12b699476b244ea5260e010d8c2ae1","Cargo.toml":"397318dc0e80f559c5f570a71e5497fd2a5ab1b4daab1f365d094f1612198968","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"86cb85d2ae07169da8c279861c53b7a055168aaaa91155576c633b8724748db6","build.rs":"1d7ecadda4a26fb0eba598789eef9b99a1b4febba9bcb61a34f0c92b1d1bbaeb","src/cmsg/mod.rs":"ccf970026c8578b1c4661fbe106093dfb62b084a231ecbb4c62eaa10df5822fe","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"1e59ea16c6e1487bbb6aa759e349000431474aa245960512cb3b5117a1ed9e21","src/lib.rs":"77d48436bbfcccaea8dc3f061acc874ef5089148bf1700fc7a61b1b3d1b575e1","src/unix.rs":"ae3cc0de15c0ec03b4aaa108a69406ee62d3b57abf5226ccd8f8e66b85c95d2d","src/windows.rs":"43da25457cb17c61369c3ba2c1d98f0ff758c5ea3207ae22969cca1f620b54af","tests/tests.rs":"bd4ee24b0e1ccab9beb444541b472bc1e815e2aba19d75572a379b6e1533449c"},"package":"ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"} +-{"files":{"Cargo.lock":"39882ba9584ef645766dbc62a5c9e3ee2a975f62f2c4d22f6abef49a7a528388","Cargo.toml":"7ad4bf29c5b820a2d3a1c7e1b016269f6d501b3067974b56b66577fca1906af0","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"86cb85d2ae07169da8c279861c53b7a055168aaaa91155576c633b8724748db6","build.rs":"1d7ecadda4a26fb0eba598789eef9b99a1b4febba9bcb61a34f0c92b1d1bbaeb","src/cmsg/mod.rs":"ccf970026c8578b1c4661fbe106093dfb62b084a231ecbb4c62eaa10df5822fe","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"1e59ea16c6e1487bbb6aa759e349000431474aa245960512cb3b5117a1ed9e21","src/lib.rs":"77d48436bbfcccaea8dc3f061acc874ef5089148bf1700fc7a61b1b3d1b575e1","src/unix.rs":"2c2a32c3df9d27cc8964b46681700215ecf1f1baa6a363b88f1f11bdd4c92cea","src/windows.rs":"43da25457cb17c61369c3ba2c1d98f0ff758c5ea3207ae22969cca1f620b54af","tests/tests.rs":"bd4ee24b0e1ccab9beb444541b472bc1e815e2aba19d75572a379b6e1533449c"},"package":"fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"} \ No newline at end of file -+{"files":{"Cargo.lock":"b6db9f61ff4fdb22fb4a928df627f66d2a12b699476b244ea5260e010d8c2ae1","Cargo.toml":"397318dc0e80f559c5f570a71e5497fd2a5ab1b4daab1f365d094f1612198968","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"86cb85d2ae07169da8c279861c53b7a055168aaaa91155576c633b8724748db6","build.rs":"1d7ecadda4a26fb0eba598789eef9b99a1b4febba9bcb61a34f0c92b1d1bbaeb","src/cmsg/mod.rs":"ccf970026c8578b1c4661fbe106093dfb62b084a231ecbb4c62eaa10df5822fe","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"1e59ea16c6e1487bbb6aa759e349000431474aa245960512cb3b5117a1ed9e21","src/lib.rs":"77d48436bbfcccaea8dc3f061acc874ef5089148bf1700fc7a61b1b3d1b575e1","src/unix.rs":"6023c09ad7052ca141f5dc6eb797bed1928b5d083c05e35cb4911780f5ac2329","src/windows.rs":"43da25457cb17c61369c3ba2c1d98f0ff758c5ea3207ae22969cca1f620b54af","tests/tests.rs":"bd4ee24b0e1ccab9beb444541b472bc1e815e2aba19d75572a379b6e1533449c"},"package":"ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"} ++{"files":{"Cargo.lock":"39882ba9584ef645766dbc62a5c9e3ee2a975f62f2c4d22f6abef49a7a528388","Cargo.toml":"7ad4bf29c5b820a2d3a1c7e1b016269f6d501b3067974b56b66577fca1906af0","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"4b2d0aca6789fa39e03d6738e869ea0988cceba210ca34ebb59c15c463e93a04","benches/throughput.rs":"86cb85d2ae07169da8c279861c53b7a055168aaaa91155576c633b8724748db6","build.rs":"1d7ecadda4a26fb0eba598789eef9b99a1b4febba9bcb61a34f0c92b1d1bbaeb","src/cmsg/mod.rs":"ccf970026c8578b1c4661fbe106093dfb62b084a231ecbb4c62eaa10df5822fe","src/cmsg/unix.rs":"7917bce2f3c8e844eca2e4cfea82669b2a31cf311321dc42532626db4ee42de8","src/cmsg/windows.rs":"6fb936ec4a283efc5796872e777441e3039c40589073865644a8ef7936af4f4b","src/fallback.rs":"1e59ea16c6e1487bbb6aa759e349000431474aa245960512cb3b5117a1ed9e21","src/lib.rs":"77d48436bbfcccaea8dc3f061acc874ef5089148bf1700fc7a61b1b3d1b575e1","src/unix.rs":"a71b09bc3d274fc4c43f2f2f3d8b655ee6ae12e6144ee8de99764fc9cc37b40e","src/windows.rs":"43da25457cb17c61369c3ba2c1d98f0ff758c5ea3207ae22969cca1f620b54af","tests/tests.rs":"bd4ee24b0e1ccab9beb444541b472bc1e815e2aba19d75572a379b6e1533449c"},"package":"fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"} diff --git a/comm/third_party/rust/quinn-udp/src/unix.rs b/comm/third_party/rust/quinn-udp/src/unix.rs -index c892796..8c3bc81 100644 +index 3e7212f..a95924b 100644 --- a/comm/third_party/rust/quinn-udp/src/unix.rs +++ b/comm/third_party/rust/quinn-udp/src/unix.rs @@ -53,9 +53,9 @@ extern "C" { @@ -703,18 +703,18 @@ index c892796..8c3bc81 100644 (libc::SOL_UDP, gro::UDP_GRO) => unsafe { stride = cmsg::decode::(cmsg) as usize; diff --git a/comm/third_party/rust/wgpu-hal/.cargo-checksum.json b/comm/third_party/rust/wgpu-hal/.cargo-checksum.json -index 63e2204..07ba2a9 100644 +index 3cf6233..91926f7 100644 --- a/comm/third_party/rust/wgpu-hal/.cargo-checksum.json +++ b/comm/third_party/rust/wgpu-hal/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"286855c60ad3c19725ffbc3a6fe010fa38b75db3fa7b73f1e64cb5513c8aa5f7","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"c7fea58d1cfe49634cd92e54fc10a9d871f4b275321a4cd8c09e449122caaeb4","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"40c99bddda32846afd639d84b9a160ddab338092560b5cb3402112ff37ab4fba","examples/halmark/main.rs":"f42ceef4ee26c1e2b5b917e697ae662099550fece8bb715b2076a55413662c6c","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"f41b15e898da0047d33c7bed0dd311ca6fade507ba453c238a7babf789480b6c","examples/ray-traced-triangle/main.rs":"ecbd4625050f1be3d61af83f4effffa11b8baaef127ec17a2d3ca0465cb7d967","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"f451fb0c416a637f11542e9b166a48800be50c48925779b06d40a9bc87958d97","src/auxil/dxgi/exception.rs":"4ac0004d0efc88ba7738e166064796400ca1eb9518bd8cc642144401989ec796","src/auxil/dxgi/factory.rs":"1d8cfeb733e34b97d5b879705fc5621ab7b9be578aebb3c3ddadea992effb566","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"a3b52fd87e512bb94df79c8cadf89a1fbcf7ab0a3a8c7fa1280c2e54cb75d96e","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"e687710ea0c9e88c9be0e2acd39d136635b835ffb941886b875811b3ec945080","src/dx12/adapter.rs":"50126670fe298d7f0e2606cdb34302993e519063c939b3214c77b0e83dbd74a9","src/dx12/command.rs":"f11a50b9ada035ed27affcb0e127c63bc62ba8bfae47a9357251b263e1e7f872","src/dx12/conv.rs":"f800cf605bda983828330f73a53d7f47549a17e7263572a356168dd656270c31","src/dx12/descriptor.rs":"e3371d7539c44ffc4c7b958b6d948855200bb3c4e7da9577835cc0bca695807b","src/dx12/device.rs":"1b3b7d69ce0ed6ccc04861d70eaa24de5a1a99ac5409a89733201c7eea4e1be6","src/dx12/instance.rs":"0c4bd516177ddb3724529aa30751ebde41d6f80e6bf294a23ec621712663cedd","src/dx12/mod.rs":"abaafcbfb0ebb980bd62182b390796667e5786458a71af492a02f30663081174","src/dx12/sampler.rs":"64464c32452ee63ac49014a03ca3be894ab9b74e11dc853567b5da5f846faae6","src/dx12/shader_compilation.rs":"c901a797c69e08c8c0ec93ea37c5f31084eb21c26c7d703d7031f987f2243509","src/dx12/suballocation.rs":"44f5ab65c1eeb54a53841dc769b749ce7702e32b89a6bd2ddd1a270f63437a50","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f00305d56cac0636d4cb86cc44ee69c291bfb3d5f6d5e8d745adce9a28a6a1d5","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"b02a3c11b22c896cf66ef206f5d4bb4e24988ecadc29972c572baf347f54aa04","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"4cd87c567e2c1d9d4e9f21f9475fc7533656e6335f13136a79633a7e49b0f836","src/gles/command.rs":"c13d50eeb1a4aaab367a3b4a7fe6c25c8c73377e68d0d8cc43791d1a7202d23b","src/gles/conv.rs":"7f885dd2bc72641d22f8f2e688ebdd857663bfe315f1b5364ea302f99a05adbf","src/gles/device.rs":"12d88fe7b33fe97228f337ec445437e386c434ca0fbe6b2d3828805bf8d3c413","src/gles/egl.rs":"de77822e37369bb4c41e1efcd92134aa220acf0dd8a251a0d4499dd4d541a547","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"083cd49747aba6272002aba0b0c37e5768cdbc2a1b8bacd1a244ee905d3f7b0f","src/gles/mod.rs":"897365cdd34914a654532c8d9592cb3a3f460bd50ac2b6ba72106a105c12ac10","src/gles/queue.rs":"f0a75fa2431f84feaf9a2cd0ba156ffa011b0ba671b167066d2f9341bde89109","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"ed0cee8844447b461ed5340f81eb55bb051ceaac67a5768985318ceac133cbe4","src/lib.rs":"14b6451f06a1667919179d4e1b92da33ab07e72f710ae3c33dbf8326a778e3b8","src/metal/adapter.rs":"13032f7c0aa66a3a3c2f6e6b8ee9e224cfc90601a865ac086d91cbcc37f06668","src/metal/command.rs":"1ec1a9e0e1ccf298c2c416b96e60827173e6584c9061b8dd582b7789545ce60a","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"8f451b3f48878d353449234533d6756c1a88661f33e5c080448f535315a8a005","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"96e2f978524a2bac3c5ce21917bc3580a77e54b7188e78e0b0d78efa0fa6d914","src/metal/surface.rs":"50c628f0e555f936707e57dbff59bbc9b1b05b10747b8303189b878b6fb28795","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"89a938411204b33082200a1306fe589587de15142392d7ec591676512e4cfeb2","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"3167878f073b3865092d7ad0ec944162bc627b7d6d5e0a7931d46f1a47c3918c","src/validation_canary.rs":"2e8f84e5f85671b3e55ddd410476171c762e34cbea315b37921cbb6ff18bfb4f","src/vulkan/adapter.rs":"d05b0a8332d2b70d12881a83c6157c5dc07f203a1511cb056c51f24cdd4da66e","src/vulkan/command.rs":"e058758398d4ec6fda1d0274d99b92ae541f4263ee804bcb1c42ca96f8610ac0","src/vulkan/conv.rs":"d45664854b8d160f061474d5343b0df389ef76dadb705cba8d61575c91d48b01","src/vulkan/device.rs":"7397f7c13fc1c0a2cc7d24a20cd7834924982cf8805603432a5fa8267e400e3d","src/vulkan/drm.rs":"b40575f188b2668e60c96ad62970b993930fd25c668a402b17086ed2f1b76b4e","src/vulkan/instance.rs":"737e3d42c108801ca2a088d6d44f08c5f2acd1159415a01616fc47498c47ad1e","src/vulkan/mod.rs":"b40396d5ad38ff9c15fa7213fc6ec9ecb14488019b1ca0bba60e5ec8ed50cd35","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59","src/vulkan/semaphore_list.rs":"102266d8e1b9f2ec1decf681bcc9e1a4cbff29533a258f2699fb6c573c434771"},"package":null} +-{"files":{"Cargo.toml":"c9fb3a416136835a876f6d44bcc350f57d666f20f50f88cd704b33432bf7fa80","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"dc0d97139e8205818c703741c7be7cb3b96888bd5917b8d6fc6133731e403c21","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"e720cf033fecfdc7e4f34010af2a86340c99b8aaabf69559d32391521e25de6c","examples/halmark/main.rs":"4861eedb91ca024ede5b18e6db5a861b03f21108de9566bcc4d71bb5720df62a","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"5f4cfa893e99dfec559803bc513457793dcc549154c604385fb287f99a3ea675","examples/ray-traced-triangle/main.rs":"8cbfdf3e4cd29d23e2c9fd543a36976d849a7161670e094baeda390db9306b57","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"3ca856c93916c0be714924ff077aa1f366be5557cc164210154d252e7e49fb77","src/auxil/dxgi/exception.rs":"7138831914a59dc7cbb71512068e9134144b9bc8f43312682edccb0b3ee24a48","src/auxil/dxgi/factory.rs":"81e479e550a09127384d8080e43d5f5bae8e8dda6082fe41a87bea8f872eb0f1","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"e7a9dfb48d8ef8cbe58b28b1ace5caf7818ee50505ba3220bb0509e66ae469b7","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"94898f747476e269b2910d42e769f2bbb6be0cb466ad92f9d381f55799d2756e","src/dx12/adapter.rs":"7c9cd88b5a20d0daad5c09c3b6a9cab0e1289db229be3839f05c9ea67de2a19f","src/dx12/command.rs":"9aa909aaa12ab9bf09e73f26b7197eee620fe6e9b742b3df90dc352e612d874d","src/dx12/conv.rs":"a320fca45fd1990762ff10dad1d8bbb29833d9b693b0887bf2898021a737612c","src/dx12/dcomp.rs":"53bde57557d80e571257f76933d66475a765e063d8b635675f9dd2563039a4c5","src/dx12/descriptor.rs":"ccd4feb6bd3e0a0ffc26142f8a81fca26180d0f50146b6eb2f670cbc89ea7064","src/dx12/device.rs":"592d9336e807e5bbafe204923e6546547160eb660ade038f5707cbd3cb9306fe","src/dx12/instance.rs":"75bddc3807756c691ede3ff944915e443a8bb2b5ac6d0d99babd4ed50d1e3fb9","src/dx12/mod.rs":"592a110924259e8754a919bfbc3efda1292f7416a447d585fe56fe910e6225d0","src/dx12/sampler.rs":"d18d243efe4fa667dbab5b75b5b91d47de94d441976d9f44a46a2b49ba38473d","src/dx12/shader_compilation.rs":"c901a797c69e08c8c0ec93ea37c5f31084eb21c26c7d703d7031f987f2243509","src/dx12/suballocation.rs":"014e9ec4a94519b877ad3adc2ea5d182aa6cdf502248009d28dc5833a9edb93c","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f77c2406f2c42fed77fce29d731b490ac615dae2c5ddb9e01fee4f8ece1b3a34","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"2577d3aef6441f5b42b427d80ba3cf7fee2a97b2fc12335a1fba383e8a79a9b2","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"2a3348204f7489e856d6c37c7e39f92adfbb65308eaeb684c0296e68dc6d76e2","src/gles/command.rs":"c13d50eeb1a4aaab367a3b4a7fe6c25c8c73377e68d0d8cc43791d1a7202d23b","src/gles/conv.rs":"6ffb8688de38c2fdd956571dd549535259e2811225adc1df02509e8e642ee775","src/gles/device.rs":"7a8679a4e990bb237cab961b0a2dbdbf5414c57b943048f63f7ddb189932db58","src/gles/egl.rs":"2509e5a5c422e213a3050d852d70a13dfc06737c829a8fc169f45791d8e27fed","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"a2e7b6abd2fd4a438de90b9f58452c64cd8bba83999c90fd6390e3db128b9c6c","src/gles/mod.rs":"b6d80623eaf58719bafac26875fd0f75f8546b02c58b96a75d703e3a350e31df","src/gles/queue.rs":"5152f5698a2998a55125d13f04788b960726fd4b49ae4d2ec8f9642c8825c7fd","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"ed0cee8844447b461ed5340f81eb55bb051ceaac67a5768985318ceac133cbe4","src/lib.rs":"b5354488fbffb0ae575700c8f4addec0d8466a402df4eb4ab338a41aae9b683b","src/metal/adapter.rs":"75ddf04c2005238d69e4eed5ac86ea43644089eccf23b39a77ab94753e85f61c","src/metal/command.rs":"20bf613b67ccc043de6e8ad3f3d332bbb678cc06c1593cf1880083de090574ba","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"a293d260b5618b8b8fcb0137c51302989a7982f3db06ca051b5fe898266776f7","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"1bbd3f19d1e518cae6f388da7327279495410e9e50446e1d4bead300855045a5","src/metal/surface.rs":"22dc6da86ac74b044b6498764920f0467bb5060f4dffb156b6c1e260db0c48b7","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"b5edc5e2c52287dfbd4f619e36097ac233041eb9ab287b889b6ee477d740fa09","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"619eb69530736fdcc9fc076eca30191d8d1227abb9cefcf54d717ea93cc4b1a9","src/validation_canary.rs":"2e8f84e5f85671b3e55ddd410476171c762e34cbea315b37921cbb6ff18bfb4f","src/vulkan/adapter.rs":"6bdc81c83dbb651e71bb16dba0d028dd51a415271f086a903784b9c49b4bf717","src/vulkan/command.rs":"22fd05428c141ce58000c8f3541d39195023ffdfb72c4b00379a5c50a3ecea82","src/vulkan/conv.rs":"03eb28b81d3e41ccfcb2b3f7f029cd671ccdf9556594c6d8b6cc2b22144ec4f2","src/vulkan/device.rs":"e034e43f9f344695a44d11186505411549dd1397027977645cbfd56950096289","src/vulkan/drm.rs":"45f7bf1dd854688a65261e4674d80f90c997b193a162fd2ae658acf4e2003552","src/vulkan/instance.rs":"435fb4f22c3c39463f1a33f1a946180656cc7177eeb97035c0458f5d97a1591f","src/vulkan/mod.rs":"d8e724879230eca5a09bf166b103a66a2f1d7a2a8a382bdb1fd1e2c6abc5fdcd","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59","src/vulkan/semaphore_list.rs":"6e548d810d75daf5ed31b6e520ece32c8ef97e4b66926c17f0d4317f355802e5","src/vulkan/swapchain/mod.rs":"1baef6ef36d005fe03b27ea15a91d1c5c7114eb7f777a50e67ca5f448a53291b","src/vulkan/swapchain/native.rs":"6d9aadeeb1d6774afe070e0f5d995576c1d5c1097dfc471d914b2e16782a4d69"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"286855c60ad3c19725ffbc3a6fe010fa38b75db3fa7b73f1e64cb5513c8aa5f7","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"c7fea58d1cfe49634cd92e54fc10a9d871f4b275321a4cd8c09e449122caaeb4","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"40c99bddda32846afd639d84b9a160ddab338092560b5cb3402112ff37ab4fba","examples/halmark/main.rs":"f42ceef4ee26c1e2b5b917e697ae662099550fece8bb715b2076a55413662c6c","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"f41b15e898da0047d33c7bed0dd311ca6fade507ba453c238a7babf789480b6c","examples/ray-traced-triangle/main.rs":"ecbd4625050f1be3d61af83f4effffa11b8baaef127ec17a2d3ca0465cb7d967","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"f451fb0c416a637f11542e9b166a48800be50c48925779b06d40a9bc87958d97","src/auxil/dxgi/exception.rs":"4ac0004d0efc88ba7738e166064796400ca1eb9518bd8cc642144401989ec796","src/auxil/dxgi/factory.rs":"1d8cfeb733e34b97d5b879705fc5621ab7b9be578aebb3c3ddadea992effb566","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"a3b52fd87e512bb94df79c8cadf89a1fbcf7ab0a3a8c7fa1280c2e54cb75d96e","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"e687710ea0c9e88c9be0e2acd39d136635b835ffb941886b875811b3ec945080","src/dx12/adapter.rs":"50126670fe298d7f0e2606cdb34302993e519063c939b3214c77b0e83dbd74a9","src/dx12/command.rs":"f11a50b9ada035ed27affcb0e127c63bc62ba8bfae47a9357251b263e1e7f872","src/dx12/conv.rs":"f800cf605bda983828330f73a53d7f47549a17e7263572a356168dd656270c31","src/dx12/descriptor.rs":"e3371d7539c44ffc4c7b958b6d948855200bb3c4e7da9577835cc0bca695807b","src/dx12/device.rs":"1b3b7d69ce0ed6ccc04861d70eaa24de5a1a99ac5409a89733201c7eea4e1be6","src/dx12/instance.rs":"0c4bd516177ddb3724529aa30751ebde41d6f80e6bf294a23ec621712663cedd","src/dx12/mod.rs":"abaafcbfb0ebb980bd62182b390796667e5786458a71af492a02f30663081174","src/dx12/sampler.rs":"64464c32452ee63ac49014a03ca3be894ab9b74e11dc853567b5da5f846faae6","src/dx12/shader_compilation.rs":"c901a797c69e08c8c0ec93ea37c5f31084eb21c26c7d703d7031f987f2243509","src/dx12/suballocation.rs":"44f5ab65c1eeb54a53841dc769b749ce7702e32b89a6bd2ddd1a270f63437a50","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f00305d56cac0636d4cb86cc44ee69c291bfb3d5f6d5e8d745adce9a28a6a1d5","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"b02a3c11b22c896cf66ef206f5d4bb4e24988ecadc29972c572baf347f54aa04","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"4cd87c567e2c1d9d4e9f21f9475fc7533656e6335f13136a79633a7e49b0f836","src/gles/command.rs":"c13d50eeb1a4aaab367a3b4a7fe6c25c8c73377e68d0d8cc43791d1a7202d23b","src/gles/conv.rs":"7f885dd2bc72641d22f8f2e688ebdd857663bfe315f1b5364ea302f99a05adbf","src/gles/device.rs":"12d88fe7b33fe97228f337ec445437e386c434ca0fbe6b2d3828805bf8d3c413","src/gles/egl.rs":"de77822e37369bb4c41e1efcd92134aa220acf0dd8a251a0d4499dd4d541a547","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"083cd49747aba6272002aba0b0c37e5768cdbc2a1b8bacd1a244ee905d3f7b0f","src/gles/mod.rs":"897365cdd34914a654532c8d9592cb3a3f460bd50ac2b6ba72106a105c12ac10","src/gles/queue.rs":"f0a75fa2431f84feaf9a2cd0ba156ffa011b0ba671b167066d2f9341bde89109","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"ed0cee8844447b461ed5340f81eb55bb051ceaac67a5768985318ceac133cbe4","src/lib.rs":"14b6451f06a1667919179d4e1b92da33ab07e72f710ae3c33dbf8326a778e3b8","src/metal/adapter.rs":"13032f7c0aa66a3a3c2f6e6b8ee9e224cfc90601a865ac086d91cbcc37f06668","src/metal/command.rs":"1ec1a9e0e1ccf298c2c416b96e60827173e6584c9061b8dd582b7789545ce60a","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"8f451b3f48878d353449234533d6756c1a88661f33e5c080448f535315a8a005","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"96e2f978524a2bac3c5ce21917bc3580a77e54b7188e78e0b0d78efa0fa6d914","src/metal/surface.rs":"50c628f0e555f936707e57dbff59bbc9b1b05b10747b8303189b878b6fb28795","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"89a938411204b33082200a1306fe589587de15142392d7ec591676512e4cfeb2","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"3167878f073b3865092d7ad0ec944162bc627b7d6d5e0a7931d46f1a47c3918c","src/validation_canary.rs":"2e8f84e5f85671b3e55ddd410476171c762e34cbea315b37921cbb6ff18bfb4f","src/vulkan/adapter.rs":"d05b0a8332d2b70d12881a83c6157c5dc07f203a1511cb056c51f24cdd4da66e","src/vulkan/command.rs":"e058758398d4ec6fda1d0274d99b92ae541f4263ee804bcb1c42ca96f8610ac0","src/vulkan/conv.rs":"d45664854b8d160f061474d5343b0df389ef76dadb705cba8d61575c91d48b01","src/vulkan/device.rs":"7397f7c13fc1c0a2cc7d24a20cd7834924982cf8805603432a5fa8267e400e3d","src/vulkan/drm.rs":"9b45013e5ac5c191d42916f493581a5cf6e51882544da63901068c349fd74b1b","src/vulkan/instance.rs":"737e3d42c108801ca2a088d6d44f08c5f2acd1159415a01616fc47498c47ad1e","src/vulkan/mod.rs":"b40396d5ad38ff9c15fa7213fc6ec9ecb14488019b1ca0bba60e5ec8ed50cd35","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59","src/vulkan/semaphore_list.rs":"102266d8e1b9f2ec1decf681bcc9e1a4cbff29533a258f2699fb6c573c434771"},"package":null} ++{"files":{"Cargo.toml":"c9fb3a416136835a876f6d44bcc350f57d666f20f50f88cd704b33432bf7fa80","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"dc0d97139e8205818c703741c7be7cb3b96888bd5917b8d6fc6133731e403c21","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"e720cf033fecfdc7e4f34010af2a86340c99b8aaabf69559d32391521e25de6c","examples/halmark/main.rs":"4861eedb91ca024ede5b18e6db5a861b03f21108de9566bcc4d71bb5720df62a","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"5f4cfa893e99dfec559803bc513457793dcc549154c604385fb287f99a3ea675","examples/ray-traced-triangle/main.rs":"8cbfdf3e4cd29d23e2c9fd543a36976d849a7161670e094baeda390db9306b57","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"3ca856c93916c0be714924ff077aa1f366be5557cc164210154d252e7e49fb77","src/auxil/dxgi/exception.rs":"7138831914a59dc7cbb71512068e9134144b9bc8f43312682edccb0b3ee24a48","src/auxil/dxgi/factory.rs":"81e479e550a09127384d8080e43d5f5bae8e8dda6082fe41a87bea8f872eb0f1","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"e7a9dfb48d8ef8cbe58b28b1ace5caf7818ee50505ba3220bb0509e66ae469b7","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"94898f747476e269b2910d42e769f2bbb6be0cb466ad92f9d381f55799d2756e","src/dx12/adapter.rs":"7c9cd88b5a20d0daad5c09c3b6a9cab0e1289db229be3839f05c9ea67de2a19f","src/dx12/command.rs":"9aa909aaa12ab9bf09e73f26b7197eee620fe6e9b742b3df90dc352e612d874d","src/dx12/conv.rs":"a320fca45fd1990762ff10dad1d8bbb29833d9b693b0887bf2898021a737612c","src/dx12/dcomp.rs":"53bde57557d80e571257f76933d66475a765e063d8b635675f9dd2563039a4c5","src/dx12/descriptor.rs":"ccd4feb6bd3e0a0ffc26142f8a81fca26180d0f50146b6eb2f670cbc89ea7064","src/dx12/device.rs":"592d9336e807e5bbafe204923e6546547160eb660ade038f5707cbd3cb9306fe","src/dx12/instance.rs":"75bddc3807756c691ede3ff944915e443a8bb2b5ac6d0d99babd4ed50d1e3fb9","src/dx12/mod.rs":"592a110924259e8754a919bfbc3efda1292f7416a447d585fe56fe910e6225d0","src/dx12/sampler.rs":"d18d243efe4fa667dbab5b75b5b91d47de94d441976d9f44a46a2b49ba38473d","src/dx12/shader_compilation.rs":"c901a797c69e08c8c0ec93ea37c5f31084eb21c26c7d703d7031f987f2243509","src/dx12/suballocation.rs":"014e9ec4a94519b877ad3adc2ea5d182aa6cdf502248009d28dc5833a9edb93c","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f77c2406f2c42fed77fce29d731b490ac615dae2c5ddb9e01fee4f8ece1b3a34","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"2577d3aef6441f5b42b427d80ba3cf7fee2a97b2fc12335a1fba383e8a79a9b2","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"2a3348204f7489e856d6c37c7e39f92adfbb65308eaeb684c0296e68dc6d76e2","src/gles/command.rs":"c13d50eeb1a4aaab367a3b4a7fe6c25c8c73377e68d0d8cc43791d1a7202d23b","src/gles/conv.rs":"6ffb8688de38c2fdd956571dd549535259e2811225adc1df02509e8e642ee775","src/gles/device.rs":"7a8679a4e990bb237cab961b0a2dbdbf5414c57b943048f63f7ddb189932db58","src/gles/egl.rs":"2509e5a5c422e213a3050d852d70a13dfc06737c829a8fc169f45791d8e27fed","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"a2e7b6abd2fd4a438de90b9f58452c64cd8bba83999c90fd6390e3db128b9c6c","src/gles/mod.rs":"b6d80623eaf58719bafac26875fd0f75f8546b02c58b96a75d703e3a350e31df","src/gles/queue.rs":"5152f5698a2998a55125d13f04788b960726fd4b49ae4d2ec8f9642c8825c7fd","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"ed0cee8844447b461ed5340f81eb55bb051ceaac67a5768985318ceac133cbe4","src/lib.rs":"b5354488fbffb0ae575700c8f4addec0d8466a402df4eb4ab338a41aae9b683b","src/metal/adapter.rs":"75ddf04c2005238d69e4eed5ac86ea43644089eccf23b39a77ab94753e85f61c","src/metal/command.rs":"20bf613b67ccc043de6e8ad3f3d332bbb678cc06c1593cf1880083de090574ba","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"a293d260b5618b8b8fcb0137c51302989a7982f3db06ca051b5fe898266776f7","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"1bbd3f19d1e518cae6f388da7327279495410e9e50446e1d4bead300855045a5","src/metal/surface.rs":"22dc6da86ac74b044b6498764920f0467bb5060f4dffb156b6c1e260db0c48b7","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"b5edc5e2c52287dfbd4f619e36097ac233041eb9ab287b889b6ee477d740fa09","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"619eb69530736fdcc9fc076eca30191d8d1227abb9cefcf54d717ea93cc4b1a9","src/validation_canary.rs":"2e8f84e5f85671b3e55ddd410476171c762e34cbea315b37921cbb6ff18bfb4f","src/vulkan/adapter.rs":"6bdc81c83dbb651e71bb16dba0d028dd51a415271f086a903784b9c49b4bf717","src/vulkan/command.rs":"22fd05428c141ce58000c8f3541d39195023ffdfb72c4b00379a5c50a3ecea82","src/vulkan/conv.rs":"03eb28b81d3e41ccfcb2b3f7f029cd671ccdf9556594c6d8b6cc2b22144ec4f2","src/vulkan/device.rs":"e034e43f9f344695a44d11186505411549dd1397027977645cbfd56950096289","src/vulkan/drm.rs":"a974295839635136f967bd6e96a40f9f8e60b1241c407c4b1d62ed42bf6d3920","src/vulkan/instance.rs":"435fb4f22c3c39463f1a33f1a946180656cc7177eeb97035c0458f5d97a1591f","src/vulkan/mod.rs":"d8e724879230eca5a09bf166b103a66a2f1d7a2a8a382bdb1fd1e2c6abc5fdcd","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59","src/vulkan/semaphore_list.rs":"6e548d810d75daf5ed31b6e520ece32c8ef97e4b66926c17f0d4317f355802e5","src/vulkan/swapchain/mod.rs":"1baef6ef36d005fe03b27ea15a91d1c5c7114eb7f777a50e67ca5f448a53291b","src/vulkan/swapchain/native.rs":"6d9aadeeb1d6774afe070e0f5d995576c1d5c1097dfc471d914b2e16782a4d69"},"package":null} diff --git a/comm/third_party/rust/wgpu-hal/src/vulkan/drm.rs b/comm/third_party/rust/wgpu-hal/src/vulkan/drm.rs -index f0a8413..0a15b82 100644 +index 807260e..75bb056 100644 --- a/comm/third_party/rust/wgpu-hal/src/vulkan/drm.rs +++ b/comm/third_party/rust/wgpu-hal/src/vulkan/drm.rs -@@ -72,17 +72,15 @@ impl super::Instance { +@@ -81,10 +81,8 @@ impl super::Instance { matches the DRM device referred to by our file descriptor. */ @@ -725,16 +725,8 @@ index f0a8413..0a15b82 100644 + let primary_devid = drm_props.primary_minor as u64; + let render_devid = drm_props.render_minor as u64; - // Various platforms use different widths between `dev_t` and `c_int`, so just - // force-convert to `u64` to keep things portable. - #[allow(clippy::useless_conversion)] - if [primary_devid, render_devid] - .map(u64::from) -- .contains(&drm_stat.st_rdev) -+ .contains(&(drm_stat.st_rdev as u64)) - { - physical_device = Some(device) - } + // On most platforms, both `*_devid`s and `st_rdev` are `dev_t`s (which is generally + // observed to be an unsigned integral type no greater than 64 bits). However, on some diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk index ba024e8..1479348 100644 --- a/config/makefiles/rust.mk @@ -750,6 +742,18 @@ index ba024e8..1479348 100644 ifdef MOZ_USING_SCCACHE export RUSTC_WRAPPER=$(CCACHE) endif +diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild +index b14afa4..ce578d2 100644 +--- a/config/system-headers.mozbuild ++++ b/config/system-headers.mozbuild +@@ -865,7 +865,6 @@ system_headers = [ + "sys/shm.h", + "sys/siginfo.h", + "sys/signal.h", +- "sys/single_threaded.h", + "sys/socket.h", + "sys/sockio.h", + "sys/sparc/frame.h", diff --git a/dom/events/ShortcutKeyDefinitions.cpp b/dom/events/ShortcutKeyDefinitions.cpp index 3f34f45..97b7c98 100644 --- a/dom/events/ShortcutKeyDefinitions.cpp @@ -771,10 +775,10 @@ index 3f34f45..97b7c98 100644 {u"keypress", u"VK_RIGHT", nullptr, u"alt", u"cmd_moveRight2"}, // macOS {u"keypress", u"VK_LEFT", nullptr, u"alt,shift", u"cmd_selectLeft2"}, // macOS diff --git a/dom/media/CallbackThreadRegistry.cpp b/dom/media/CallbackThreadRegistry.cpp -index 84ef7b7..e041636 100644 +index 4a1ec72..fc70f51 100644 --- a/dom/media/CallbackThreadRegistry.cpp +++ b/dom/media/CallbackThreadRegistry.cpp -@@ -96,7 +96,9 @@ void CallbackThreadRegistry::Unregister(ProfilerThreadId aThreadId) { +@@ -97,7 +97,9 @@ void CallbackThreadRegistry::Unregister(ProfilerThreadId aThreadId) { return; } } @@ -826,7 +830,7 @@ index a0ec09e..59d98a3 100644 void setDataFromBytes(SkSpan allocation) { T* data = TCast(allocation.data()); diff --git a/image/SurfaceCache.cpp b/image/SurfaceCache.cpp -index f97b32d..7857331 100644 +index c01b18e..4e47963 100644 --- a/image/SurfaceCache.cpp +++ b/image/SurfaceCache.cpp @@ -1625,7 +1625,7 @@ void SurfaceCache::Initialize() { @@ -839,10 +843,10 @@ index f97b32d..7857331 100644 #endif memorySize = 256 * 1024 * 1024; // Fall back to 256MB. diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build -index 0e8504f..015993f 100644 +index 8454c22..1daaa7f 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build -@@ -106,7 +106,7 @@ if CONFIG["TARGET_OS"] == "iOS": +@@ -112,7 +112,7 @@ if CONFIG["TARGET_OS"] == "iOS": "src/base/process_util_ios.cpp", ] @@ -852,10 +856,10 @@ index 0e8504f..015993f 100644 "src/base/process_util_linux.cc", "src/base/time_posix.cc", diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc -index 5e7a653..90c600e 100644 +index 8aa6f15..287213e 100644 --- a/ipc/chromium/src/base/message_loop.cc +++ b/ipc/chromium/src/base/message_loop.cc -@@ -26,7 +26,7 @@ +@@ -29,7 +29,7 @@ # include "base/message_pump_libevent.h" #endif #if defined(XP_LINUX) || defined(__DragonFly__) || defined(XP_FREEBSD) || \ @@ -864,7 +868,7 @@ index 5e7a653..90c600e 100644 # if defined(MOZ_WIDGET_GTK) # include "base/message_pump_glib.h" # endif -@@ -280,7 +280,7 @@ MessageLoop::MessageLoop(Type type, nsISerialEventTarget* aEventTarget) +@@ -275,7 +275,7 @@ MessageLoop::MessageLoop(Type type, nsISerialEventTarget* aEventTarget) # if defined(XP_DARWIN) pump_ = base::MessagePumpMac::Create(); # elif defined(XP_LINUX) || defined(__DragonFly__) || defined(XP_FREEBSD) || \ @@ -909,10 +913,10 @@ index d28abbc..af56adf 100644 } diff --git a/ipc/chromium/src/base/process_util_posix.cc b/ipc/chromium/src/base/process_util_posix.cc -index 23b8807..aec9dc4 100644 +index 7b72b5d..247b080 100644 --- a/ipc/chromium/src/base/process_util_posix.cc +++ b/ipc/chromium/src/base/process_util_posix.cc -@@ -129,7 +129,7 @@ void CloseSuperfluousFds(void* aCtx, bool (*aShouldPreserve)(void*, int)) { +@@ -128,7 +128,7 @@ void CloseSuperfluousFds(void* aCtx, bool (*aShouldPreserve)(void*, int)) { #if defined(ANDROID) static const rlim_t kSystemDefaultMaxFds = 1024; static const char kFDDir[] = "/proc/self/fd"; @@ -922,10 +926,10 @@ index 23b8807..aec9dc4 100644 static const char kFDDir[] = "/proc/self/fd"; #elif defined(XP_DARWIN) diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -index 085e570..c7bae19 100644 +index 2fc3ed4..184448d 100644 --- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc +++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -288,6 +288,18 @@ bool Channel::ChannelImpl::ProcessIncomingMessages() { +@@ -291,6 +291,18 @@ bool ChannelPosix::ProcessIncomingMessages() { if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { const unsigned payload_len = cmsg->cmsg_len - CMSG_LEN(0); DCHECK(payload_len % sizeof(int) == 0); @@ -944,7 +948,7 @@ index 085e570..c7bae19 100644 wire_fds = reinterpret_cast(CMSG_DATA(cmsg)); num_wire_fds = payload_len / 4; -@@ -299,7 +311,9 @@ bool Channel::ChannelImpl::ProcessIncomingMessages() { +@@ -302,7 +314,9 @@ bool ChannelPosix::ProcessIncomingMessages() { IGNORE_EINTR(close(wire_fds[i])); return false; } @@ -955,7 +959,7 @@ index 085e570..c7bae19 100644 } } diff --git a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc -index 0cfd739..439aed9 100644 +index 5bf6a89..f9cbe6a 100644 --- a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc +++ b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc @@ -37,7 +37,7 @@ @@ -968,10 +972,10 @@ index 0cfd739..439aed9 100644 # define HAVE_PIPE2 1 #endif diff --git a/js/src/moz.build b/js/src/moz.build -index 01fa3cb..3e15ce7 100644 +index f19c88e..03b07fd 100644 --- a/js/src/moz.build +++ b/js/src/moz.build -@@ -508,6 +508,11 @@ elif CONFIG["OS_ARCH"] == "WASI": +@@ -516,6 +516,11 @@ elif CONFIG["OS_ARCH"] == "WASI": "threading/noop/NoopThread.cpp", ] else: @@ -984,7 +988,7 @@ index 01fa3cb..3e15ce7 100644 "threading/posix/CpuCount.cpp", "threading/posix/PosixThread.cpp", diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp -index 4e4189d..37dc13a 100644 +index e77289c..4946275 100644 --- a/js/src/util/NativeStack.cpp +++ b/js/src/util/NativeStack.cpp @@ -31,6 +31,9 @@ @@ -997,7 +1001,7 @@ index 4e4189d..37dc13a 100644 #else # error "Unsupported platform" #endif -@@ -117,6 +120,14 @@ void* js::GetNativeStackBaseImpl() { +@@ -116,6 +119,14 @@ void* js::GetNativeStackBaseImpl() { # endif } @@ -1012,11 +1016,61 @@ index 4e4189d..37dc13a 100644 #elif defined(__wasi__) // Since we rearrange the layout for wasi via --stack-first flag for the linker +diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp +index 5f329ff..5a049f2 100644 +--- a/js/src/vm/DateTime.cpp ++++ b/js/src/vm/DateTime.cpp +@@ -10,6 +10,15 @@ + # include "mozilla/intl/ICU4CGlue.h" + # include "mozilla/intl/TimeZone.h" + #endif ++ ++#if JS_HAS_INTL_API && defined(__HAIKU__) ++# pragma GCC visibility push(default) ++# include ++# include ++# include ++# pragma GCC visibility pop ++#endif ++ + #include "mozilla/ScopeExit.h" + #include "mozilla/Span.h" + #include "mozilla/TextUtils.h" +@@ -812,6 +821,21 @@ static bool ReadTimeZoneLink(std::string_view tz, + #endif /* JS_HAS_INTL_API */ + + void js::DateTimeInfo::internalResyncICUDefaultTimeZone() { ++#if defined(__HAIKU__) ++ BTimeZone timeZone; ++ if (BLocaleRoster::Default()->GetDefaultTimeZone(&timeZone) == B_OK) { ++ BString timeZoneID = timeZone.ID(); ++ if (timeZoneID.Length() > 0) { ++ mozilla::Span tzid(timeZoneID.String(), ++ timeZoneID.Length()); ++ auto result = mozilla::intl::TimeZone::SetDefaultTimeZone(tzid); ++ if (result.isOk() && result.unwrap()) { ++ return; ++ } ++ } ++ } ++ (void)mozilla::intl::TimeZone::SetDefaultTimeZoneFromHostTimeZone(); ++#else + #if JS_HAS_INTL_API + if (const char* tzenv = std::getenv("TZ")) { + std::string_view tz(tzenv); +@@ -874,5 +898,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() { + // Intentionally ignore any errors, because we don't have a good way to report + // errors from this function. + (void)mozilla::intl::TimeZone::SetDefaultTimeZoneFromHostTimeZone(); +-#endif ++#endif /* JS_HAS_INTL_API */ ++#endif /* __HAIKU__ */ + } diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 06954b3..f9dd019 100644 +index 291eaa1..373b8ec 100644 --- a/js/src/wasm/WasmSignalHandlers.cpp +++ b/js/src/wasm/WasmSignalHandlers.cpp -@@ -232,6 +232,17 @@ using namespace js::wasm; +@@ -238,6 +238,17 @@ using namespace js::wasm; # define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) # define R32_sig(p) ((p)->uc_mcontext.mc_srr0) # endif @@ -1035,7 +1089,7 @@ index 06954b3..f9dd019 100644 # define EIP_sig(p) ((p)->thread.uts.ts32.__eip) # define EBP_sig(p) ((p)->thread.uts.ts32.__ebp) diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h -index 7d63f47..2fe6932 100644 +index 7d63f47..f72e3bd 100644 --- a/media/ffvpx/config_unix64.h +++ b/media/ffvpx/config_unix64.h @@ -291,7 +291,7 @@ @@ -1047,8 +1101,17 @@ index 7d63f47..2fe6932 100644 #define HAVE_GETENV 1 #define HAVE_GETHRTIME 0 #define HAVE_GETOPT 1 +@@ -319,7 +319,7 @@ + #define HAVE_NANOSLEEP 1 + #define HAVE_PEEKNAMEDPIPE 0 + #define HAVE_PTHREAD_CANCEL 1 +-#define HAVE_SCHED_GETAFFINITY 1 ++#define HAVE_SCHED_GETAFFINITY 0 + #define HAVE_SECITEMIMPORT 0 + #define HAVE_SETCONSOLETEXTATTRIBUTE 0 + #define HAVE_SETCONSOLECTRLHANDLER 0 diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c -index b0db033..efe0927 100644 +index 0511ad9..1e0b48e 100644 --- a/media/libcubeb/src/cubeb.c +++ b/media/libcubeb/src/cubeb.c @@ -79,6 +79,10 @@ oss_init(cubeb ** context, char const * context_name); @@ -1593,10 +1656,10 @@ index 7ab524b..c9a0c91 100644 # We allow warnings for third-party code that can be updated from upstream. diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h -index 82a2ee5..ade709b 100644 +index 15c70f8..661cf60 100644 --- a/mfbt/Assertions.h +++ b/mfbt/Assertions.h -@@ -231,7 +231,7 @@ MOZ_NoReturn(int aLine) { +@@ -220,7 +220,7 @@ MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename, MOZ_NoReturn(line); \ } while (false) @@ -1606,10 +1669,10 @@ index 82a2ee5..ade709b 100644 # define MOZ_REALLY_CRASH(line) __builtin_trap() diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index f689389..9fd2377 100644 +index 6c725ea..e1222ea 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -11309,6 +11309,8 @@ +@@ -11549,6 +11549,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1618,7 +1681,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11353,6 +11355,8 @@ +@@ -11593,6 +11595,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1627,7 +1690,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11386,6 +11390,8 @@ +@@ -11626,6 +11630,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1636,7 +1699,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11405,6 +11411,8 @@ +@@ -11645,6 +11651,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1645,7 +1708,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11424,6 +11432,8 @@ +@@ -11664,6 +11672,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1654,7 +1717,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11443,6 +11453,8 @@ +@@ -11683,6 +11693,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1663,7 +1726,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -11471,6 +11483,8 @@ +@@ -11711,6 +11723,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1672,7 +1735,7 @@ index f689389..9fd2377 100644 #else value: false #endif -@@ -12423,6 +12437,8 @@ +@@ -12682,6 +12696,8 @@ type: bool #if defined(MOZ_WIDGET_ANDROID) value: true @@ -1682,10 +1745,10 @@ index f689389..9fd2377 100644 value: false #endif diff --git a/moz.configure b/moz.configure -index 323b48f..5455491 100755 +index f668a32..a0ff1ff 100755 --- a/moz.configure +++ b/moz.configure -@@ -866,6 +866,8 @@ def strip_flags(flags, profiling, target): +@@ -884,6 +884,8 @@ def strip_flags(flags, profiling, target): # On Darwin, it tries to strip things it can't, so we need to limit its scope. elif target.kernel == "Darwin": return ["-x", "-S"] @@ -1761,10 +1824,10 @@ index d1659d8..b43e029 100644 + #endif // MutexPlatformData_posix_h diff --git a/mozglue/misc/PlatformMutex.h b/mozglue/misc/PlatformMutex.h -index ac5459c..d014d11 100644 +index 0cb03ad..fb4b014 100644 --- a/mozglue/misc/PlatformMutex.h +++ b/mozglue/misc/PlatformMutex.h -@@ -49,10 +49,17 @@ class MutexImpl { +@@ -48,10 +48,17 @@ class MutexImpl { PlatformData* platformData(); #if !defined(XP_WIN) && !defined(__wasi__) @@ -1798,7 +1861,7 @@ index c24cfac..bc22455 100644 #include #include diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp -index b2778ad..553fdfc 100644 +index e570e5f..9bb4b5c 100644 --- a/netwerk/base/nsStandardURL.cpp +++ b/netwerk/base/nsStandardURL.cpp @@ -320,7 +320,7 @@ struct DumpLeakedURLs { @@ -1823,10 +1886,10 @@ index b2456d2..127baf9 100644 + "network" +] diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c -index f9fa0f6..7bb78a9 100644 +index 863af6b..4994bd4 100644 --- a/nsprpub/pr/src/misc/prsystem.c +++ b/nsprpub/pr/src/misc/prsystem.c -@@ -244,7 +244,7 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors(void) { +@@ -234,7 +234,7 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors(void) { PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void) { PRUint64 bytes = 0; @@ -1836,10 +1899,10 @@ index f9fa0f6..7bb78a9 100644 long pageSize = sysconf(_SC_PAGESIZE); long pageCount = sysconf(_SC_PHYS_PAGES); diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py -index cb469db..4c047f5 100644 +index 84896ea..12f58fc 100644 --- a/python/mach/mach/site.py +++ b/python/mach/mach/site.py -@@ -1509,6 +1509,14 @@ def _create_venv_with_pthfile( +@@ -1519,6 +1519,14 @@ def _create_venv_with_pthfile( _ensure_python_exe(Path(target_venv.python_path).parent) @@ -1868,10 +1931,10 @@ index f40c9ec..09eec7d 100644 elif version: print("Your version of Rust (%s) is too old." % version) diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py -index 7460eb1..f0ca764 100644 +index 7e8d5e6..78f057b 100644 --- a/python/mozboot/mozboot/bootstrap.py +++ b/python/mozboot/mozboot/bootstrap.py -@@ -33,6 +33,7 @@ from mozboot.centosfedora import CentOSFedoraBootstrapper +@@ -34,6 +34,7 @@ from mozboot.centosfedora import CentOSFedoraBootstrapper from mozboot.debian import DebianBootstrapper from mozboot.freebsd import FreeBSDBootstrapper from mozboot.gentoo import GentooBootstrapper @@ -1879,7 +1942,7 @@ index 7460eb1..f0ca764 100644 from mozboot.mozconfig import MozconfigBuilder from mozboot.mozillabuild import MozillaBuildBootstrapper from mozboot.openbsd import OpenBSDBootstrapper -@@ -308,6 +309,10 @@ class Bootstrapper: +@@ -309,6 +310,10 @@ class Bootstrapper: args["version"] = platform.release() args["flavor"] = platform.system() @@ -1983,30 +2046,11 @@ index 25f43bb..967aee7 100644 "kFreeBSD": "__FreeBSD_kernel__", "Linux": "__linux__", "NetBSD": "__NetBSD__", -diff --git a/python/sites/mach.txt b/python/sites/mach.txt -index 3c869f0..a29cac0 100644 ---- a/python/sites/mach.txt -+++ b/python/sites/mach.txt -@@ -57,12 +57,12 @@ pth:xpcom/geckoprocesstypes_generator - pth:xpcom/idl-parser - # glean-sdk may not be installable if a wheel isn't available - # and it has to be built from source. --pypi-optional:glean-sdk==64.4.0:telemetry will not be collected -+#pypi-optional:glean-sdk==64.4.0:telemetry will not be collected - pypi-optional:orjson>=3.10.15:json operations will be slower in various tools - # Mach gracefully handles the case where `psutil` is unavailable. - # We aren't (yet) able to pin packages in automation, so we have to - # support down to the oldest locally-installed version (5.4.2). --pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data -+#pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data - pypi-optional:zstandard>=0.11.1,<=0.23.0:zstd archives will not be possible to extract - vendored-fallback:pyyaml:third_party/python/pyyaml/lib/:faster native loading is disabled - vendored:third_party/python/ansicon diff --git a/security/certverifier/ExtendedValidation.cpp b/security/certverifier/ExtendedValidation.cpp -index ca05c3b..c9bf842 100644 +index ffd7d37..2ce0dfc 100644 --- a/security/certverifier/ExtendedValidation.cpp +++ b/security/certverifier/ExtendedValidation.cpp -@@ -1306,7 +1306,9 @@ nsresult LoadExtendedValidationInfo() { +@@ -1350,7 +1350,9 @@ nsresult LoadExtendedValidationInfo() { // The entries for the debug EV roots are at indices 0 through // NUM_TEST_EV_ROOTS - 1. Since they're not built-in, they probably // haven't been loaded yet. @@ -2017,10 +2061,10 @@ index ca05c3b..c9bf842 100644 unsigned char certFingerprint[SHA256_LENGTH]; srv = PK11_HashBuf(SEC_OID_SHA256, certFingerprint, cert->derCert.data, diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml -index 43415b9..4205288 100644 +index b6dd6e8..9823568 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml -@@ -2635,6 +2635,12 @@ criteria = "safe-to-deploy" +@@ -2875,6 +2875,12 @@ criteria = "safe-to-deploy" delta = "6.0.1 -> 6.0.2" notes = "I'm the author of the changes in this version of the crate." @@ -2033,7 +2077,7 @@ index 43415b9..4205288 100644 [[audits.goblin]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" -@@ -3327,6 +3333,12 @@ criteria = "safe-to-deploy" +@@ -3775,6 +3781,12 @@ criteria = "safe-to-deploy" version = "0.14.0" notes = "Victor and Myk developed this crate at Mozilla." @@ -2047,10 +2091,10 @@ index 43415b9..4205288 100644 who = "Mike Hommey " criteria = "safe-to-deploy" diff --git a/supply-chain/config.toml b/supply-chain/config.toml -index 37f99fc..9a99f8f 100644 +index 2e6d4c1..25e2c3b 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml -@@ -72,6 +72,10 @@ notes = "Used for testing." +@@ -76,6 +76,10 @@ notes = "Used for testing." dependency-criteria = { tokio-reactor = [], tokio-threadpool = [] } notes = "The dependencies on tokio-reactor and tokio-threadpools are just a hack to pin the version used by audioipc-{client,server}. Suppress vetting on those for the same reasons behind the policy entries." @@ -2061,7 +2105,7 @@ index 37f99fc..9a99f8f 100644 [policy.gluesmith] criteria = "safe-to-run" notes = "Used for fuzzing." -@@ -96,6 +100,10 @@ notes = "This crate has two testing-only dependencies which are specified as reg +@@ -108,6 +112,10 @@ notes = "Patched version of upstream to avoid unnecessary unused dependencies an audit-as-crates-io = false notes = "This override is an api-compatible fork with an orthogonal implementation." @@ -2073,10 +2117,10 @@ index 37f99fc..9a99f8f 100644 audit-as-crates-io = false notes = "This was originally servo code which Bobby Holley put on crates.io some years ago and that was moved in-tree as first-party code later on." diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py -index b3fb9d1..f226b4b 100755 +index 79d39f8..18c5dbf 100755 --- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py +++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py -@@ -104,7 +104,7 @@ elif system == "Linux": +@@ -94,7 +94,7 @@ elif system == "Linux": info["os"] = "linux" info["linux_distro"] = distribution @@ -2086,10 +2130,10 @@ index b3fb9d1..f226b4b 100755 version = os_version = sys.platform elif system == "Darwin": diff --git a/third_party/chromium/build/config/gcc/BUILD.gn b/third_party/chromium/build/config/gcc/BUILD.gn -index ebfa332..fbc53fe 100644 +index 6e291bb..89c0f24 100644 --- a/third_party/chromium/build/config/gcc/BUILD.gn +++ b/third_party/chromium/build/config/gcc/BUILD.gn -@@ -91,7 +91,7 @@ if (is_component_build && !is_android) { +@@ -93,7 +93,7 @@ if (is_component_build && !is_android) { # Settings for executables. config("executable_config") { configs = executable_and_shared_library_configs_ @@ -2125,6 +2169,30 @@ index 459aace..b2989da 100644 #else #define dav1d_set_thread_name(name) do {} while (0) +diff --git a/third_party/llama.cpp/src/llama-mmap.cpp b/third_party/llama.cpp/src/llama-mmap.cpp +index 519e81b..6389354 100644 +--- a/third_party/llama.cpp/src/llama-mmap.cpp ++++ b/third_party/llama.cpp/src/llama-mmap.cpp +@@ -23,6 +23,10 @@ + #endif + #endif + ++#ifdef __HAIKU__ ++#undef _POSIX_MEMLOCK_RANGE ++#endif ++ + #if defined(_WIN32) + #define WIN32_LEAN_AND_MEAN + #ifndef NOMINMAX +@@ -448,7 +452,7 @@ void * llama_mmap::addr() const { return pimpl->addr; } + + void llama_mmap::unmap_fragment(size_t first, size_t last) { pimpl->unmap_fragment(first, last); } + +-#if defined(_POSIX_MEMLOCK_RANGE) || defined(_WIN32) ++#if defined(_POSIX_MEMLOCK_RANGE) || defined(_WIN32) || defined(__HAIKU__) + const bool llama_mmap::SUPPORTED = true; + #else + const bool llama_mmap::SUPPORTED = false; diff --git a/third_party/rust/glslopt/.cargo-checksum.json b/third_party/rust/glslopt/.cargo-checksum.json index ddd05da..d75a57c 100644 --- a/third_party/rust/glslopt/.cargo-checksum.json @@ -2450,7 +2518,7 @@ index d1c92cd..aa8db00 100644 } // extern "C" diff --git a/third_party/rust/quinn-udp/src/unix.rs b/third_party/rust/quinn-udp/src/unix.rs -index c892796..8c3bc81 100644 +index 3e7212f..a95924b 100644 --- a/third_party/rust/quinn-udp/src/unix.rs +++ b/third_party/rust/quinn-udp/src/unix.rs @@ -53,9 +53,9 @@ extern "C" { @@ -2606,10 +2674,10 @@ index c892796..8c3bc81 100644 stride = cmsg::decode::(cmsg) as usize; diff --git a/toolkit/components/processtools/ProcInfo_haiku.cpp b/toolkit/components/processtools/ProcInfo_haiku.cpp new file mode 100644 -index 0000000..ad41c23 +index 0000000..6c08732 --- /dev/null +++ b/toolkit/components/processtools/ProcInfo_haiku.cpp -@@ -0,0 +1,86 @@ +@@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -2622,6 +2690,10 @@ index 0000000..ad41c23 + +namespace mozilla { + ++nsresult GetCurrentProcessMemoryUsage(uint64_t* aResult) { ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++ +int GetCycleTimeFrequencyMHz() { return 0; } + +nsresult GetCpuTimeSinceProcessStartInMs(uint64_t* aResult) { @@ -3036,22 +3108,22 @@ index 46860f6..b010d4d 100644 # else mRemoteServer = MakeUnique(); diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build -index 161ad33..4c778d8 100644 +index de16e73..a3ba5b4 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -347,6 +347,10 @@ if CONFIG["OS_ARCH"] == "Darwin": - "-weak_framework MediaPlayer", - ] +@@ -106,6 +106,10 @@ def Libxul(name, output_category=None): + if name == "xul-gtest" and CONFIG["MOZ_LTO_FAT"]: + LDFLAGS += ["-fno-lto"] +if CONFIG["OS_ARCH"] == "Haiku": + OS_LIBS += [ + "be", + ] - if CONFIG["OS_ARCH"] == "WINNT": - OS_LIBS += [ + # The real libxul definition is in ./build/moz.build, but we define a + # xul library here such that # FINAL_LIBRARY = 'xul' refers to here, which diff --git a/toolkit/library/rust/moz.build b/toolkit/library/rust/moz.build -index 34c94a1..56edb0a 100644 +index 2077fba..4390d2b 100644 --- a/toolkit/library/rust/moz.build +++ b/toolkit/library/rust/moz.build @@ -8,6 +8,12 @@ include("gkrust-features.mozbuild") @@ -3068,10 +3140,10 @@ index 34c94a1..56edb0a 100644 # We don't want to enable refcount logging during rusttests, since the # relevant FFI symbols wouldn't be found. diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs -index 3e796cb..005a31d 100644 +index e52e88a..870392c 100644 --- a/toolkit/modules/ShortcutUtils.sys.mjs +++ b/toolkit/modules/ShortcutUtils.sys.mjs -@@ -64,7 +64,7 @@ export var ShortcutUtils = { +@@ -95,7 +95,7 @@ export var ShortcutUtils = { let elemString = ""; let haveCloverLeaf = false; if (elemMod.match("accel")) { @@ -3080,7 +3152,7 @@ index 3e796cb..005a31d 100644 haveCloverLeaf = true; } else { elemString += -@@ -73,7 +73,7 @@ export var ShortcutUtils = { +@@ -104,7 +104,7 @@ export var ShortcutUtils = { } } if (elemMod.match("access")) { @@ -3089,7 +3161,7 @@ index 3e796cb..005a31d 100644 elemString += lazy.PlatformKeys.GetStringFromName("VK_CONTROL") + lazy.PlatformKeys.GetStringFromName("MODIFIER_SEPARATOR"); -@@ -94,14 +94,26 @@ export var ShortcutUtils = { +@@ -125,14 +125,26 @@ export var ShortcutUtils = { lazy.PlatformKeys.GetStringFromName("MODIFIER_SEPARATOR"); } if (elemMod.match("alt")) { @@ -3122,7 +3194,7 @@ index 3e796cb..005a31d 100644 } if (elemMod.match("meta") && this.metaKeyIsCommandKey()) { elemString += -@@ -110,9 +122,15 @@ export var ShortcutUtils = { +@@ -141,9 +153,15 @@ export var ShortcutUtils = { } if (haveCloverLeaf) { @@ -3142,10 +3214,10 @@ index 3e796cb..005a31d 100644 return elemString; diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index 77069ea..9838fc4 100644 +index 52bca06..d67b413 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -296,6 +296,8 @@ def audio_backends_default(target): +@@ -295,6 +295,8 @@ def audio_backends_default(target): return ("sndio",) elif target.kernel == "Darwin": return ("audiounit",) @@ -3154,7 +3226,7 @@ index 77069ea..9838fc4 100644 elif target.os == "NetBSD": return ("sunaudio",) elif target.os == "SunOS": -@@ -313,6 +315,7 @@ option( +@@ -312,6 +314,7 @@ option( "aaudio", "alsa", "audiounit", @@ -3162,7 +3234,7 @@ index 77069ea..9838fc4 100644 "jack", "opensl", "oss", -@@ -351,6 +354,11 @@ def imply_audiounit(values, target): +@@ -350,6 +353,11 @@ def imply_audiounit(values, target): return any("audiounit" in value for value in values) or None @@ -3174,7 +3246,7 @@ index 77069ea..9838fc4 100644 @depends("--enable-audio-backends") def imply_jack(values): return any("jack" in value for value in values) or None -@@ -414,6 +422,8 @@ imply_option( +@@ -413,6 +421,8 @@ imply_option( set_config("MOZ_AUDIOUNIT_RUST", imply_audiounit, when="--enable-audio-backends") @@ -3183,7 +3255,7 @@ index 77069ea..9838fc4 100644 imply_option( "--enable-jack", imply_jack, reason="--enable-audio-backends", when=use_pkg_config ) -@@ -3104,6 +3114,7 @@ def forkserver_default(target, build_project): +@@ -3157,6 +3167,7 @@ def forkserver_default(target, build_project): (target.os == "GNU" and target.kernel == "Linux") or target.os == "FreeBSD" or target.os == "OpenBSD" @@ -3191,7 +3263,7 @@ index 77069ea..9838fc4 100644 ) -@@ -3831,7 +3842,7 @@ with only_when(compile_environment): +@@ -3899,7 +3910,7 @@ with only_when(compile_environment): @depends(target) def default_user_appdir(target): @@ -3201,7 +3273,7 @@ index 77069ea..9838fc4 100644 return ".mozilla" diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build -index aa2df2b..a42f897 100644 +index ce84646..1ebee31 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -7,8 +7,12 @@ @@ -3219,10 +3291,10 @@ index aa2df2b..a42f897 100644 ] diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp -index dcc07d8..cdc5eaf 100644 +index 5a0d902..340e4f3 100644 --- a/toolkit/system/gnome/nsGIOService.cpp +++ b/toolkit/system/gnome/nsGIOService.cpp -@@ -470,6 +470,32 @@ gboolean g_app_info_launch_default_for_uri_openbsd(const char* uri, +@@ -493,6 +493,32 @@ gboolean g_app_info_launch_default_for_uri_openbsd(const char* uri, } #endif @@ -3255,7 +3327,7 @@ index dcc07d8..cdc5eaf 100644 static NS_IMETHODIMP LaunchWithURIImpl(RefPtr aInfo, nsIURI* aUri, const char* aXDGToken = nullptr) { GList uris = {0}; -@@ -483,6 +509,10 @@ static NS_IMETHODIMP LaunchWithURIImpl(RefPtr aInfo, nsIURI* aUri, +@@ -506,6 +532,10 @@ static NS_IMETHODIMP LaunchWithURIImpl(RefPtr aInfo, nsIURI* aUri, gboolean result = g_app_info_launch_uris_openbsd( aInfo, spec.get(), GetLaunchContext(aXDGToken).get(), getter_Transfers(error)); @@ -3266,7 +3338,7 @@ index dcc07d8..cdc5eaf 100644 #else gboolean result = g_app_info_launch_uris( aInfo, &uris, GetLaunchContext(aXDGToken).get(), getter_Transfers(error)); -@@ -871,6 +901,9 @@ static nsresult ShowURIImpl(nsIURI* aURI, const char* aXDGToken = nullptr) { +@@ -894,6 +924,9 @@ static nsresult ShowURIImpl(nsIURI* aURI, const char* aXDGToken = nullptr) { #ifdef __OpenBSD__ if (!g_app_info_launch_default_for_uri_openbsd( spec.get(), GetLaunchContext(aXDGToken).get(), @@ -3276,7 +3348,7 @@ index dcc07d8..cdc5eaf 100644 #else if (!g_app_info_launch_default_for_uri(spec.get(), GetLaunchContext(aXDGToken).get(), -@@ -906,6 +939,9 @@ static nsresult LaunchPathImpl(const nsACString& aPath, +@@ -929,6 +962,9 @@ static nsresult LaunchPathImpl(const nsACString& aPath, #ifdef __OpenBSD__ g_app_info_launch_default_for_uri_openbsd(spec.get(), GetLaunchContext(aXDGToken).get(), @@ -3712,7 +3784,7 @@ index 0000000..d9ac4f3 + +#endif diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css -index 9533f5e..973cf1c 100644 +index c2618b8..dceb4c0 100644 --- a/toolkit/themes/shared/popup.css +++ b/toolkit/themes/shared/popup.css @@ -44,6 +44,12 @@ panel { @@ -3729,10 +3801,10 @@ index 9533f5e..973cf1c 100644 appearance: auto; -moz-default-appearance: menupopup; diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild -index e8399d2..f76e321 100644 +index 0ab59fb..29d5f2d 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild -@@ -148,6 +148,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": +@@ -149,6 +149,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": DIRS += [ "/media/mozva", "/toolkit/system/gnome", @@ -3741,17 +3813,17 @@ index e8399d2..f76e321 100644 if CONFIG["ENABLE_WEBDRIVER"]: diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 5156191..519c209 100644 +index 8be44e9..3753a38 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -346,14 +346,16 @@ MOZ_CONSTINIT nsString gProcessStartupShortcut; +@@ -342,14 +342,16 @@ MOZ_CONSTINIT nsString gProcessStartupShortcut; # ifdef MOZ_WAYLAND # include # include "mozilla/widget/nsWaylandDisplay.h" -# include "wayland-proxy.h" +# ifndef XP_HAIKU +# include "wayland-proxy.h" -+# endif /* !XP_HAIKU */ ++# endif # endif # ifdef MOZ_X11 # include @@ -3760,10 +3832,10 @@ index 5156191..519c209 100644 -#if defined(MOZ_WAYLAND) +#if defined(MOZ_WAYLAND) && !defined(XP_HAIKU) - MOZ_RUNINIT std::unique_ptr gWaylandProxy; + MOZ_CONSTINIT std::unique_ptr gWaylandProxy; #endif -@@ -435,6 +437,9 @@ static void UnexpectedExit() { +@@ -430,6 +432,9 @@ static void UnexpectedExit() { #if defined(MOZ_WAYLAND) bool IsWaylandEnabled() { @@ -3773,7 +3845,7 @@ index 5156191..519c209 100644 static bool isWaylandEnabled = []() { const char* waylandDisplay = PR_GetEnv("WAYLAND_DISPLAY"); if (!waylandDisplay) { -@@ -465,6 +470,7 @@ bool IsWaylandEnabled() { +@@ -460,6 +465,7 @@ bool IsWaylandEnabled() { return !gtk_check_version(3, 24, 30); }(); return isWaylandEnabled; @@ -3781,7 +3853,7 @@ index 5156191..519c209 100644 } #else bool IsWaylandEnabled() { return false; } -@@ -3817,7 +3823,7 @@ class XREMain { +@@ -3827,7 +3833,7 @@ class XREMain { #endif }; @@ -3790,7 +3862,7 @@ index 5156191..519c209 100644 static SmprintfPointer FormatUid(uid_t aId) { if (const auto pw = getpwuid(aId)) { return mozilla::Smprintf("%s", pw->pw_name); -@@ -3866,7 +3872,7 @@ static bool CheckForUserMismatch() { +@@ -3876,7 +3882,7 @@ static bool CheckForUserMismatch() { } return false; } @@ -3799,7 +3871,7 @@ index 5156191..519c209 100644 static bool CheckForUserMismatch() { return false; } #endif -@@ -4849,7 +4855,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4859,7 +4865,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // display_name is owned by gdk. display_name = gdk_get_display_arg_name(); bool waylandEnabled = IsWaylandEnabled(); @@ -3808,7 +3880,7 @@ index 5156191..519c209 100644 if (!display_name) { auto* proxyEnv = getenv("MOZ_DISABLE_WAYLAND_PROXY"); bool disableWaylandProxy = proxyEnv && *proxyEnv; -@@ -4904,7 +4910,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4914,7 +4920,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { } else { gdk_display_manager_open_display(gdk_display_manager_get(), nullptr); } @@ -3817,7 +3889,7 @@ index 5156191..519c209 100644 // We want to use proxy for main connection only so // restore original Wayland display for next potential Wayland connections // from gfx probe code and so on. -@@ -6202,7 +6208,9 @@ int XREMain::XRE_main(int argc, char* argv[], const BootstrapConfig& aConfig) { +@@ -6219,7 +6225,9 @@ int XREMain::XRE_main(int argc, char* argv[], const BootstrapConfig& aConfig) { if (!gfxPlatform::IsHeadless()) { # ifdef MOZ_WAYLAND WaylandDisplayRelease(); @@ -3852,10 +3924,10 @@ index 146a586..10b7fb6 100644 "(%s) %s Proxy: %s", mozilla::widget::GetDesktopEnvironmentIdentifier().get(), diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 9c94cb8..ee3e523 100644 +index a7d365d..4b5641d 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -80,6 +80,10 @@ +@@ -82,6 +82,10 @@ #ifdef XP_IOS # include "UIKitDirProvider.h" #endif @@ -3866,7 +3938,7 @@ index 9c94cb8..ee3e523 100644 #if defined(XP_MACOSX) # define APP_REGISTRY_NAME "Application Registry" -@@ -365,7 +369,7 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, +@@ -367,7 +371,7 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, } else if (!strcmp(aProperty, XRE_USER_NATIVE_MANIFESTS)) { rv = GetUserDataDirectoryHome(getter_AddRefs(file), false); NS_ENSURE_SUCCESS(rv, rv); @@ -3875,7 +3947,7 @@ index 9c94cb8..ee3e523 100644 rv = file->AppendNative("Mozilla"_ns); # else // defined(XP_MACOSX) rv = file->AppendNative(".mozilla"_ns); -@@ -1081,6 +1085,12 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, +@@ -1083,6 +1087,12 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, NS_ENSURE_SUCCESS(rv, rv); MOZ_TRY(NS_NewLocalFile(path, getter_AddRefs(localDir))); @@ -3888,7 +3960,7 @@ index 9c94cb8..ee3e523 100644 #elif defined(XP_UNIX) const char* homeDir = getenv("HOME"); if (!homeDir || !*homeDir) return NS_ERROR_FAILURE; -@@ -1190,7 +1200,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { +@@ -1202,7 +1212,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { nsresult rv; @@ -3897,7 +3969,7 @@ index 9c94cb8..ee3e523 100644 static const char* const sXR = "Mozilla"; rv = aFile->AppendNative(nsDependentCString(sXR)); -@@ -1249,7 +1259,7 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { +@@ -1261,7 +1271,7 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { } NS_ENSURE_SUCCESS(rv, rv); @@ -3927,7 +3999,7 @@ index 4c53061..76d3561 100644 # else diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build -index 99882b6..d048aba 100644 +index c6cc98e..2b77f07 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -27,7 +27,9 @@ if CONFIG["COMPILE_ENVIRONMENT"]: @@ -3942,21 +4014,21 @@ index 99882b6..d048aba 100644 if CONFIG["MOZ_ENABLE_VAAPI"]: DIRS += ["vaapitest"] diff --git a/widget/gtk/nsWaylandDisplay.cpp b/widget/gtk/nsWaylandDisplay.cpp -index d05dd41..fae45e8 100644 +index 52b239e..12342b9 100644 --- a/widget/gtk/nsWaylandDisplay.cpp +++ b/widget/gtk/nsWaylandDisplay.cpp @@ -21,7 +21,9 @@ - #include "mozilla/widget/xx-pip-v1-client-protocol.h" - #include "nsGtkKeyUtils.h" + #include "nsGtkUtils.h" + #include "nsLayoutUtils.h" #include "nsWindow.h" -#include "wayland-proxy.h" +#ifndef XP_HAIKU +# include "wayland-proxy.h" +#endif /* !XP_HAIKU */ - namespace mozilla::widget { - -@@ -253,6 +255,7 @@ static const struct moz_wl_pointer_listener pointer_listener = { + #undef LOG + #undef LOG_VERBOSE +@@ -272,6 +274,7 @@ static const struct moz_wl_pointer_listener pointer_listener = { }; void nsWaylandDisplay::SetPointer(wl_pointer* aPointer) { @@ -3964,7 +4036,7 @@ index d05dd41..fae45e8 100644 // Don't even try on such old interface if (wl_proxy_get_version((struct wl_proxy*)aPointer) < WL_POINTER_RELEASE_SINCE_VERSION) { -@@ -277,6 +280,7 @@ void nsWaylandDisplay::SetPointer(wl_pointer* aPointer) { +@@ -296,6 +299,7 @@ void nsWaylandDisplay::SetPointer(wl_pointer* aPointer) { zwp_pointer_gesture_hold_v1_add_listener(mPointerGestureHold, &gesture_hold_listener, this); } @@ -3972,12 +4044,32 @@ index d05dd41..fae45e8 100644 } void nsWaylandDisplay::RemovePointer() { -@@ -674,19 +678,22 @@ static void WlLogHandler(const char* format, va_list args) { +@@ -876,6 +880,7 @@ void nsWaylandDisplay::WaitForAsyncRoundtrips() { + } + } + ++#ifndef XP_HAIKU + // Separate crash functions for different Wayland protocol error patterns. + // These functions are marked MOZ_NEVER_INLINE to ensure distinct crash + // signatures for different error types, making them easier to track and fix. +@@ -966,6 +971,7 @@ MOZ_NEVER_INLINE static void WlLogHandler_MarshallingError(const char* error) { + GetDesktopEnvironmentIdentifier().get(), error, + WaylandProxy::GetState()); + } ++#endif + + static void WlLogHandler(const char* format, va_list args) { + char error[1000]; +@@ -981,7 +987,7 @@ static void WlLogHandler(const char* format, va_list args) { if (strstr(error, "still attached")) { return; } - +#ifndef XP_HAIKU + // Pattern matching to dispatch to specific crash functions. + // Patterns ordered by frequency (most common first) for performance. + +@@ -1044,15 +1050,18 @@ static void WlLogHandler(const char* format, va_list args) { MOZ_CRASH_UNSAFE_PRINTF("(%s) %s Proxy: %s", GetDesktopEnvironmentIdentifier().get(), error, WaylandProxy::GetState()); @@ -3997,10 +4089,10 @@ index d05dd41..fae45e8 100644 nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay) diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp -index bd3a68d..52dcddc 100644 +index c4fd591..e8ea8bde 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp -@@ -84,6 +84,10 @@ +@@ -82,6 +82,10 @@ # include "mozilla/SandboxInfo.h" #endif @@ -4011,7 +4103,7 @@ index bd3a68d..52dcddc 100644 // Slot for NS_InitXPCOM to pass information to nsSystemInfo::Init. // Only set to nonzero (potentially) if XP_UNIX. On such systems, the // system call to discover the appropriate value is not thread-safe, -@@ -1456,7 +1460,15 @@ nsresult nsSystemInfo::Init() { +@@ -1454,7 +1458,15 @@ nsresult nsSystemInfo::Init() { SetInt32Property(u"pagesize"_ns, PR_GetPageSize()); SetInt32Property(u"pageshift"_ns, PR_GetPageShift()); SetInt32Property(u"memmapalign"_ns, PR_GetMemMapAlignment()); @@ -4077,10 +4169,10 @@ index 6b566f9..2895ad9 100644 "OpenBSD", "SunOS", diff --git a/xpcom/threads/nsProcessCommon.cpp b/xpcom/threads/nsProcessCommon.cpp -index dbd9993..1431340 100644 +index b4d9998..ccbc6b8 100644 --- a/xpcom/threads/nsProcessCommon.cpp +++ b/xpcom/threads/nsProcessCommon.cpp -@@ -43,7 +43,11 @@ +@@ -41,7 +41,11 @@ # include "base/process_util.h" # endif # include @@ -4094,5 +4186,5 @@ index dbd9993..1431340 100644 # include # include -- -2.48.1 +2.52.0 diff --git a/mail-client/icedove/patches/icedove_launcher-141.0.patchset b/mail-client/icedove/patches/icedove_launcher-146.0.1.patchset similarity index 100% rename from mail-client/icedove/patches/icedove_launcher-141.0.patchset rename to mail-client/icedove/patches/icedove_launcher-146.0.1.patchset