From 9ce953ef091d51cf451d5e5f9d758bad0d7d2f49 Mon Sep 17 00:00:00 2001
From: Richard Acayan <mailingradian@gmail.com>
Date: Wed, 27 Nov 2024 22:04:52 -0500
Subject: [PATCH] treewide: update dependencies to latest version

---
 Cargo.toml         | 12 ++++++------
 src/dbus/osk.rs    |  8 ++++----
 src/ufkbd_gnome.rs |  2 +-
 src/ufkbd_kde.rs   |  4 +---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ca1ec23..2464ec2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,26 +5,26 @@ edition = "2018"
 license = "GPL-3.0-only"
 
 [dependencies]
-ashpd = { version = "0.9", features = ["wayland"] }
+ashpd = { version = "0.10", features = ["wayland"] }
 fontconfig = "0.9"
 # Disable freetype-sys, as it vendors libfreetype2 while fontconfig dynamically
 # links to it. Large dependencies should not be duplicated.
 freetype = { version = "0.7", default-features = false }
-imgref = "1.10"
+imgref = "1.11"
 libc = "0.2"
 memmap2 = "0.9"
 polling = "3.7"
-reis = "0.3"
+reis = "0.4"
 rgb = "0.8"
-tokio = { version = "1.40", features = ["macros", "rt"] }
+tokio = { version = "1.41", features = ["macros", "rt"] }
 wayland-backend = "0.3"
 wayland-client = "0.31"
 wayland-protocols = { version = "0.32", features = ["client", "staging", "unstable"] }
 wayland-protocols-wlr = { version = "0.3", features = ["client"] }
 wayland-scanner = "0.31"
 xkeysym = "0.2"
-yaml-rust2 = "0.8"
-zbus = { version = "4.4", default-features = false, features = ["tokio"] }
+yaml-rust2 = "0.9"
+zbus = { version = "5.1", default-features = false, features = ["tokio"] }
 
 [build-dependencies]
 bindgen = "0.70.1"
diff --git a/src/dbus/osk.rs b/src/dbus/osk.rs
index 595c4e6..a940c04 100644
--- a/src/dbus/osk.rs
+++ b/src/dbus/osk.rs
@@ -17,10 +17,10 @@ use wayland_client::protocol::wl_buffer::WlBuffer;
 use wayland_client::protocol::wl_shm_pool::WlShmPool;
 use wayland_client::protocol::wl_surface::WlSurface;
 use zbus::Connection;
-use zbus::InterfaceRef;
 use zbus::Result;
-use zbus::SignalContext;
 use zbus::interface;
+use zbus::object_server::InterfaceRef;
+use zbus::object_server::SignalEmitter;
 
 pub struct OSK0<T: Dispatch<WlBuffer, u32>
                  + Dispatch<WlShmPool, u32>
@@ -31,7 +31,7 @@ pub struct OSK0<T: Dispatch<WlBuffer, u32>
                  + 'static> {
     visible: AtomicBool,
     gfx: Arc<Mutex<Graphics<Surface<T>>>>,
-    sigctx: SignalContext<'static>,
+    sigctx: SignalEmitter<'static>,
     conn_wl: Arc<wayland_client::Connection>,
 }
 
@@ -83,7 +83,7 @@ impl<T: Dispatch<WlBuffer, u32>
                        conn_wl: Arc<wayland_client::Connection>)
                     -> Result<InterfaceRef<OSK0<T>>>
     {
-        let sigctx = SignalContext::new(conn, "/sm/puri/OSK0")?;
+        let sigctx = SignalEmitter::new(conn, "/sm/puri/OSK0")?;
 
         let visible = AtomicBool::new(false);
         let osk = OSK0 { visible, gfx, sigctx, conn_wl };
diff --git a/src/ufkbd_gnome.rs b/src/ufkbd_gnome.rs
index a66b3a4..d7edb32 100644
--- a/src/ufkbd_gnome.rs
+++ b/src/ufkbd_gnome.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;
 use std::time::Instant;
 use tokio::task;
 use wayland_client::globals;
-use zbus::InterfaceRef;
+use zbus::object_server::InterfaceRef;
 
 pub struct VisibilityManager(InterfaceRef<OSK0<Dispatcher>>);
 
diff --git a/src/ufkbd_kde.rs b/src/ufkbd_kde.rs
index 5effe14..5451149 100644
--- a/src/ufkbd_kde.rs
+++ b/src/ufkbd_kde.rs
@@ -7,7 +7,6 @@ mod core;
 // mod libei;
 mod wayland;
 
-use ashpd::WindowIdentifier;
 use ashpd::desktop::PersistMode;
 use ashpd::desktop::remote_desktop::DeviceType;
 use ashpd::desktop::remote_desktop::RemoteDesktop;
@@ -50,14 +49,13 @@ async fn main()
     let mut events = Events::new();
     let poller = Poller::new().unwrap();
 
-    let wi = WindowIdentifier::default();
     let rd = RemoteDesktop::new().await.unwrap();
     let session = rd.create_session().await.unwrap();
     rd.select_devices(&session,
                       DeviceType::Keyboard.into(),
                       None,
                       PersistMode::DoNot).await.unwrap();
-    rd.start(&session, &wi).await.unwrap();
+    rd.start(&session, None).await.unwrap();
     let eifd = rd.connect_to_eis(&session).await.unwrap();
     let ei_ctx = Context::new(eifd.into()).unwrap();