24 version = "0.1.0" |
24 version = "0.1.0" |
25 dependencies = [ |
25 dependencies = [ |
26 diff --git a/Cargo.toml b/Cargo.toml |
26 diff --git a/Cargo.toml b/Cargo.toml |
27 --- a/Cargo.toml |
27 --- a/Cargo.toml |
28 +++ b/Cargo.toml |
28 +++ b/Cargo.toml |
29 @@ -78,16 +78,17 @@ opt-level = 2 |
29 @@ -102,13 +102,13 @@ moz_asserts = { path = "mozglue/static/r |
30 opt-level = 2 |
30 # Other overrides |
31 |
31 chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } |
32 [patch.crates-io] |
|
33 chardetng = { git = "https://github.com/hsivonen/chardetng", rev="302c995f91f44cf26e77dc4758ad56c3ff0153ad" } |
|
34 chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } |
32 chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } |
|
33 coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } |
35 libudev-sys = { path = "dom/webauthn/libudev-sys" } |
34 libudev-sys = { path = "dom/webauthn/libudev-sys" } |
36 packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="8b4bd7d8229660a749dbe419a57ea01df9de5453" } |
35 packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="8b4bd7d8229660a749dbe419a57ea01df9de5453" } |
|
36 midir = { git = "https://github.com/mozilla/midir.git", rev = "4c11f0ffb5d6a10de4aff40a7b81218b33b94e6f" } |
37 minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "029ac0d54b237f27dc7d8d4e51bc0fb076e5e852" } |
37 minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "029ac0d54b237f27dc7d8d4e51bc0fb076e5e852" } |
|
38 - |
38 +glslopt = { path = "third_party/rust/glslopt/" } |
39 +glslopt = { path = "third_party/rust/glslopt/" } |
39 # The following overrides point to dummy projects, as a temporary measure until this is resolved: |
40 # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2. |
40 # https://github.com/rust-lang/cargo/issues/6179 |
41 # There is not going to be new version of mio 0.6, mio now being >= 0.7.11. |
41 js-sys = { git = "https://github.com/kvark/dummy-web" } |
42 [patch.crates-io.mio] |
42 slotmap = { git = "https://github.com/kvark/dummy-web" } |
43 path = "third_party/rust/mio-0.6.23" |
43 wasm-bindgen = { git = "https://github.com/kvark/dummy-web" } |
|
44 web-sys = { git = "https://github.com/kvark/dummy-web" } |
|
45 |
|
46 [patch.crates-io.cranelift-codegen] |
|
47 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
44 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
48 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
45 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
49 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
46 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
50 @@ -36,12 +36,13 @@ static inline SkMatrix SkEncodedOriginTo |
47 @@ -36,12 +36,13 @@ static inline SkMatrix SkEncodedOriginTo |
51 case kBottomRight_SkEncodedOrigin: return SkMatrix::MakeAll(-1, 0, w, 0, -1, h, 0, 0, 1); |
48 case kBottomRight_SkEncodedOrigin: return SkMatrix::MakeAll(-1, 0, w, 0, -1, h, 0, 0, 1); |