diff --git a/Cargo.toml b/Cargo.toml index f54476513..428c9d0ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,6 @@ log = "0.4" memmap2 = "0.9.0" rustix = { version = "1.0.7", features = ["fs", "pipe", "shm"] } thiserror = "2.0.12" -wayland-backend = "0.3.0" wayland-client = "0.31.1" wayland-cursor = "0.31.0" wayland-protocols = { version = "0.32.9", features = ["client", "staging", "unstable"] } @@ -44,6 +43,7 @@ calloop-wayland-source = { version = "0.4.0", optional = true } default = ["calloop", "xkbcommon"] calloop = ["dep:calloop", "calloop-wayland-source"] xkbcommon = ["dep:xkbcommon", "bytemuck", "pkg-config", "xkeysym/bytemuck"] +system = ["wayland-client/system"] [build-dependencies] pkg-config = { version = "0.3", optional = true } diff --git a/src/seat/pointer/mod.rs b/src/seat/pointer/mod.rs index 1529cf609..137ec0acc 100644 --- a/src/seat/pointer/mod.rs +++ b/src/seat/pointer/mod.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use wayland_backend::{client::InvalidId, smallvec::SmallVec}; +use wayland_client::backend::{smallvec::SmallVec, InvalidId}; use wayland_client::{ protocol::{ wl_pointer::{self, WlPointer}, diff --git a/src/shell/xdg/fallback_frame.rs b/src/shell/xdg/fallback_frame.rs index dcea2006b..5700252d5 100644 --- a/src/shell/xdg/fallback_frame.rs +++ b/src/shell/xdg/fallback_frame.rs @@ -21,7 +21,7 @@ use crate::{ subcompositor::{SubcompositorState, SubsurfaceData}, }; -use wayland_backend::client::ObjectId; +use wayland_client::backend::ObjectId; /// The size of the header bar. const HEADER_SIZE: u32 = 24; diff --git a/src/shm/multi.rs b/src/shm/multi.rs index bc903f480..51645c9f4 100644 --- a/src/shm/multi.rs +++ b/src/shm/multi.rs @@ -404,9 +404,9 @@ struct BufferObjectData { impl wayland_client::backend::ObjectData for BufferObjectData { fn event( self: Arc, - _backend: &wayland_backend::client::Backend, - msg: wayland_backend::protocol::Message, - ) -> Option> { + _backend: &wayland_client::backend::Backend, + msg: wayland_client::backend::protocol::Message, + ) -> Option> { debug_assert!(wayland_client::backend::protocol::same_interface( msg.sender_id.interface(), wl_buffer::WlBuffer::interface() @@ -417,5 +417,5 @@ impl wayland_client::backend::ObjectData for BufferObjectData { None } - fn destroyed(&self, _: wayland_backend::client::ObjectId) {} + fn destroyed(&self, _: wayland_client::backend::ObjectId) {} } diff --git a/src/shm/slot.rs b/src/shm/slot.rs index d9cf5e422..5e68872be 100644 --- a/src/shm/slot.rs +++ b/src/shm/slot.rs @@ -505,8 +505,8 @@ impl wayland_client::backend::ObjectData for BufferData { fn event( self: Arc, handle: &wayland_client::backend::Backend, - msg: wayland_backend::protocol::Message, - ) -> Option> { + msg: wayland_client::backend::protocol::Message, + ) -> Option> { debug_assert!(wayland_client::backend::protocol::same_interface( msg.sender_id.interface(), wl_buffer::WlBuffer::interface() @@ -539,7 +539,7 @@ impl wayland_client::backend::ObjectData for BufferData { None } - fn destroyed(&self, _: wayland_backend::client::ObjectId) {} + fn destroyed(&self, _: wayland_client::backend::ObjectId) {} } impl Drop for BufferData {