Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump winit to 0.28.1

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

611
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

4
Cargo.toml
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. # 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" } 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 # This is here so surfman targets winit 0.28.1.
winit = { git = "https://github.com/rust-windowing/winit.git", rev = "4192d04a53202c199f94d1b7d883a34c9ad09272" } surfman = { git = "https://github.com/servo/surfman.git" }
# surfman-chains has not yet released version 0.7 to crates.io yet. # surfman-chains has not yet released version 0.7 to crates.io yet.
surfman-chains = { git = "https://github.com/servo/surfman-chains.git" } surfman-chains = { git = "https://github.com/servo/surfman-chains.git" }

2
ports/winit/Cargo.toml
View file

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

4
ports/winit/events_loop.rs
View file

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

5
servo-tidy.toml
View file

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