Bump winit to 0.28.1

This fixes the following wayland-client error:

	Attempted to dispatch unknown opcode 0 for wl_shm, aborting.
This commit is contained in:
Thomas Gardner 2023-02-19 11:00:48 +11:00
parent f7e88665c6
commit f89602948e
5 changed files with 381 additions and 245 deletions

611
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -28,8 +28,8 @@ opt-level = 3
# This is here to dedupe winapi since mio 0.6 is still using winapi 0.2.
mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" }
# Work around bug in winit 0.24 crashing servo headless in macOS
winit = { git = "https://github.com/rust-windowing/winit.git", rev = "4192d04a53202c199f94d1b7d883a34c9ad09272" }
# This is here so surfman targets winit 0.28.1.
surfman = { git = "https://github.com/servo/surfman.git" }
# surfman-chains has not yet released version 0.7 to crates.io yet.
surfman-chains = { git = "https://github.com/servo/surfman-chains.git" }

View file

@ -60,7 +60,7 @@ shellwords = "1.0.0"
surfman = { version = "0.5", features = ["sm-winit", "sm-x11"] }
tinyfiledialogs = "3.0"
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
winit = "0.24"
winit = "0.28.1"
[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
image = "0.24"

View file

@ -31,14 +31,14 @@ impl EventsLoop {
// but on Linux, the event loop requires a X11 server.
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
pub fn new(_headless: bool) -> EventsLoop {
EventsLoop(EventLoop::Winit(Some(winit::event_loop::EventLoop::with_user_event())))
EventsLoop(EventLoop::Winit(Some(winit::event_loop::EventLoopBuilder::with_user_event().build())))
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
pub fn new(headless: bool) -> EventsLoop {
EventsLoop(if headless {
EventLoop::Headless(Arc::new((Mutex::new(false), Condvar::new())))
} else {
EventLoop::Winit(Some(winit::event_loop::EventLoop::with_user_event()))
EventLoop::Winit(Some(winit::event_loop::EventLoopBuilder::with_user_event().build()))
})
}
}

View file

@ -89,7 +89,6 @@ packages = [
# https://github.com/servo/servo/pull/28236
"dlib",
"nix",
"strsim",
# Duplicated by webrender debugger via ws
"digest",
@ -97,6 +96,10 @@ packages = [
"opaque-debug",
"sha-1",
"block-buffer",
# Duplicated by winit/surfman update.
"raw-window-handle",
"windows-sys",
]
# Files that are ignored for all tidy and lint checks.
files = [