From 84b927d507a984949dee6dcdca1c66c8388e084d Mon Sep 17 00:00:00 2001 From: hack3rmann Date: Mon, 20 Apr 2026 20:50:48 +0300 Subject: [PATCH 1/3] re-export feature `client_system` from `wayland_backend` --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index f54476513..078b6d82d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,6 +44,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"] +client_system = ["wayland-backend/client_system"] [build-dependencies] pkg-config = { version = "0.3", optional = true } From 1533d54268070edd15cf718cd6c4a18e71e803eb Mon Sep 17 00:00:00 2001 From: hack3rmann Date: Tue, 21 Apr 2026 11:04:04 +0300 Subject: [PATCH 2/3] remove explicit dependency on `wayland-backend` --- Cargo.toml | 3 +-- src/seat/pointer/mod.rs | 2 +- src/shell/xdg/fallback_frame.rs | 2 +- src/shm/multi.rs | 8 ++++---- src/shm/slot.rs | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 078b6d82d..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,7 +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"] -client_system = ["wayland-backend/client_system"] +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..c4ad78793 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::{InvalidId, smallvec::SmallVec}; 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 { From 0cff051ed6f8541f3b9301d2a0f467ed3bcfd915 Mon Sep 17 00:00:00 2001 From: hack3rmann Date: Wed, 22 Apr 2026 13:34:24 +0300 Subject: [PATCH 3/3] format `src/seat/pointer/mod.rs` --- src/seat/pointer/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seat/pointer/mod.rs b/src/seat/pointer/mod.rs index c4ad78793..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_client::backend::{InvalidId, smallvec::SmallVec}; +use wayland_client::backend::{smallvec::SmallVec, InvalidId}; use wayland_client::{ protocol::{ wl_pointer::{self, WlPointer},