diff -r 56ecd2ae6e61 -r 90e3d0cf8567 mozilla-silence-no-return-type.patch --- a/mozilla-silence-no-return-type.patch Sun May 01 18:18:56 2022 +0200 +++ b/mozilla-silence-no-return-type.patch Sun Jun 12 16:05:04 2022 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 1191efd2ea64c4081a1825176a50e872a525d4da +# Parent 6d59717f59a1c0dc50140e750d665c7e98de3e66 diff --git a/Cargo.lock b/Cargo.lock --- a/Cargo.lock +++ b/Cargo.lock -@@ -2196,18 +2196,16 @@ name = "glsl-to-cxx" +@@ -2207,18 +2207,16 @@ name = "glsl-to-cxx" version = "0.1.0" dependencies = [ "glsl", @@ -26,16 +26,15 @@ diff --git a/Cargo.toml b/Cargo.toml --- a/Cargo.toml +++ b/Cargo.toml -@@ -106,13 +106,13 @@ moz_asserts = { path = "mozglue/static/r - async-task = { git = "https://github.com/smol-rs/async-task", rev="f6488e35beccb26eb6e85847b02aa78a42cd3d0e" } - chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } +@@ -109,12 +109,13 @@ chardetng = { git = "https://github.com/ chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } + fog = { path = "toolkit/components/glean/api" } libudev-sys = { path = "dom/webauthn/libudev-sys" } - packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="8b4bd7d8229660a749dbe419a57ea01df9de5453" } + packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="c149d0a519bf878567c7630096737669ec2ff15f" } midir = { git = "https://github.com/mozilla/midir.git", rev = "4c11f0ffb5d6a10de4aff40a7b81218b33b94e6f" } minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "029ac0d54b237f27dc7d8d4e51bc0fb076e5e852" } -- + +glslopt = { path = "third_party/rust/glslopt/" } # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2. # There is not going to be new version of mio 0.6, mio now being >= 0.7.11.