From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- Cargo.toml | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index e3936430f9..36341dd1ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -152,8 +152,10 @@ backtrace = { path = "build/rust/backtrace" } # Patch bindgen 0.63 to 0.69 bindgen_0_63 = { package = "bindgen", path = "build/rust/bindgen-0.63" } +# Locally patch bindgen for https://github.com/rust-lang/rust-bindgen/pull/2824 +bindgen = { path = "third_party/rust/bindgen" } -# Patch nix 0.26 to 0.27 +# Patch nix 0.26 to 0.28 nix = { path = "build/rust/nix" } # Patch indexmap 2.0 to 1.0 @@ -168,12 +170,15 @@ autocfg = { path = "third_party/rust/autocfg" } # Patch goblin 0.7.0 to 0.8 goblin = { path = "build/rust/goblin" } -# Patch scroll 0.11 to 0.12 -scroll = { path = "build/rust/scroll" } - # Patch memoffset from 0.8.0 to 0.9.0 since it's compatible and it avoids duplication memoffset = { path = "build/rust/memoffset" } +# Patch `hashbrown` 0.12.* to depend on 0.14.* +hashbrown = { path = "build/rust/hashbrown" } + +# Patch `libloading` 0.7 to depend on 0.8, which moves from `winapi` to `windows-sys`. +libloading = { path = "build/rust/libloading" } + # The following overrides point to dummy projects, as a temporary measure until this is resolved: # https://github.com/rust-lang/cargo/issues/6179 js-sys = { path = "build/rust/dummy-web/js-sys" } @@ -194,12 +199,14 @@ zip = { path = "third_party/rust/zip" } # Workaround for https://github.com/rust-lang/cargo/issues/11232 rure = { path = "third_party/rust/rure" } +# Patch `plist` to work with `indexmap` 2.* +plist = { path = "third_party/rust/plist" } + # To-be-published changes. -cssparser = { git = "https://github.com/servo/rust-cssparser", rev = "aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" } -cssparser-macros = { git = "https://github.com/servo/rust-cssparser", rev = "aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" } unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" } # Other overrides +any_all_workaround = { git = "https://github.com/hsivonen/any_all_workaround", rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80" } chardetng = { git = "https://github.com/hsivonen/chardetng", rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83" } @@ -216,26 +223,23 @@ warp = { git = "https://github.com/seanmonstar/warp", rev = "9d081461ae1167eb321 malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" } # application-services overrides to make updating them all simpler. -interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -relevancy = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -sql-support = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -suggest = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -sync15 = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -tabs = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -viaduct = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } -webext-storage = { git = "https://github.com/mozilla/application-services", rev = "e6ccfed09ebe663f464a33968f42e656c152e584" } +interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +relevancy = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +sql-support = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +suggest = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +sync15 = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +tabs = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +viaduct = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } +webext-storage = { git = "https://github.com/mozilla/application-services", rev = "e0563d725f852f617878ecc13a03cdf50c85cd5a" } # Patch mio 0.8.8 to use windows-sys 0.52 (backport https://github.com/tokio-rs/mio/commit/eea9e3e0c469480e5c59c01e6c3c7e5fd88f0848) mio_0_8 = { package = "mio", git = "https://github.com/glandium/mio", rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05" } +# Patch `gpu-descriptor` 0.3.0 to remove unnecessary `allocator-api2` dep.: +# Still waiting for the now-merged to be released. +gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "7b71a4e47c81903ad75e2c53deb5ab1310f6ff4d" } + # 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. [patch.crates-io.mio] path = "third_party/rust/mio-0.6.23" - -[patch."https://github.com/mozilla/uniffi-rs.git"] -uniffi = "0.27.1" -uniffi_bindgen = "0.27.1" -uniffi_build = "0.27.1" -uniffi_macros = "0.27.1" -weedle2 = "=5.0.0" -- cgit v1.2.3