Bug 1683387 - Use a local fork of winit because 0.19 is abandoned upstream. r=gw

This has some changes to fix using newer Rust compilers and
an aarch64 breakage.

Differential Revision: https://phabricator.services.mozilla.com/D100158
This commit is contained in:
Jeff Muizelaar 2020-12-21 01:01:48 +00:00
Родитель 7ec698fd1c
Коммит 9e7839608c
2 изменённых файлов: 8 добавлений и 6 удалений

12
gfx/wr/Cargo.lock сгенерированный
Просмотреть файл

@ -462,7 +462,7 @@ dependencies = [
"mozangle 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.61.0",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (git+https://github.com/jrmuizel/winit?branch=wr)",
]
[[package]]
@ -711,7 +711,7 @@ dependencies = [
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (git+https://github.com/jrmuizel/winit?branch=wr)",
]
[[package]]
@ -1842,7 +1842,7 @@ dependencies = [
"glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.61.0",
"winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (git+https://github.com/jrmuizel/winit?branch=wr)",
]
[[package]]
@ -1915,7 +1915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "winit"
version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "git+https://github.com/jrmuizel/winit?branch=wr#947af776e1a3ab47000b893068b4d0750861bdb0"
dependencies = [
"android_glue 0.2.3 (git+https://github.com/rust-windowing/android-rs-glue.git?rev=e3ac6edea5814e1faca0c31ea8fac6877cb929ea)",
"backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1979,7 +1979,7 @@ dependencies = [
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"tracy-rs 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.61.0",
"winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.5 (git+https://github.com/jrmuizel/winit?branch=wr)",
"yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2255,7 +2255,7 @@ dependencies = [
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
"checksum winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
"checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
"checksum winit 0.19.5 (git+https://github.com/jrmuizel/winit?branch=wr)" = "<none>"
"checksum wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
"checksum ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"

Просмотреть файл

@ -23,3 +23,5 @@ panic = "abort"
# This can be removed once a new version of android_glue is published to crates.io.
[patch.crates-io]
android_glue = { git = "https://github.com/rust-windowing/android-rs-glue.git", rev = "e3ac6edea5814e1faca0c31ea8fac6877cb929ea" }
# this is a version that fixes some incompatibilites with newer rust/aarch64
winit = { version = "0.19", git = "https://github.com/jrmuizel/winit", branch="wr" }