chore: update to zbus 5

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Cargo.toml

@@ -13,7 +13,7 @@ resolver = "2"
 
 [workspace.dependencies]
 tracing = "0.1"
-zbus = { version = "4.4", features = ["p2p"] }
+zbus = { version = "5.0", features = ["p2p", "serde_bytes"] }
 pixman-sys = "0.1"
 qemu-display = { path = "qemu-display", version = "0.1" }
 keycodemap = { path = "keycodemap", version = "0.1" }

qemu-display/Cargo.toml

@@ -14,7 +14,6 @@ tracing.workspace = true
 zbus.workspace = true
 cfg-if = "1.0"
 derivative = "2.2"
-zvariant = { version = "4", features = ["serde_bytes"] }
 libc = "0.2"
 enumflags2 = { version = "0.7", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }

qemu-display/src/audio.rs

@@ -57,7 +57,7 @@ pub struct Volume {
     default_path = "/org/qemu/Display1/Audio",
     interface = "org.qemu.Display1.Audio"
 )]
-trait Audio {
+pub trait Audio {
     /// RegisterOutListener method
     fn register_out_listener(&self, listener: Fd<'_>) -> zbus::Result<()>;
 
@@ -269,7 +269,7 @@ impl Audio {
             &p0,
         )?;
         self.proxy.register_out_listener(p0).await?;
-        let c = zbus::ConnectionBuilder::unix_stream(p1)
+        let c = zbus::connection::Builder::unix_stream(p1)
             .p2p()
             .serve_at(
                 "/org/qemu/Display1/AudioOutListener",
@@ -289,7 +289,7 @@ impl Audio {
             &p0,
         )?;
         self.proxy.register_in_listener(p0).await?;
-        let c = zbus::ConnectionBuilder::unix_stream(p1)
+        let c = zbus::connection::Builder::unix_stream(p1)
             .p2p()
             .serve_at(
                 "/org/qemu/Display1/AudioInListener",

qemu-display/src/console.rs

@@ -110,7 +110,7 @@ impl Console {
             &p0,
         )?;
         self.proxy.register_listener(p0).await?;
-        let c = zbus::ConnectionBuilder::unix_stream(p1)
+        let c = zbus::connection::Builder::unix_stream(p1)
             .p2p()
             .serve_at("/org/qemu/Display1/Listener", ConsoleListener::new(handler))?
             .build()

qemu-display/src/display.rs

@@ -9,7 +9,7 @@ use zbus::{
     fdo::ManagedObjects,
     names::{BusName, OwnedUniqueName, UniqueName, WellKnownName},
     zvariant::OwnedObjectPath,
-    Connection, OwnerChangedStream,
+    Connection, proxy::OwnerChangedStream,
 };
 
 #[cfg(unix)]

qemu-display/src/lib.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::too_many_arguments)]
 
-pub use zbus;
 pub use memmap2;
+pub use zbus;
 
 pub mod util;
 #[cfg(windows)]

qemu-display/src/multi_touch.rs

@@ -17,6 +17,6 @@ pub enum TouchEventKind {
 pub trait MultiTouch {
     fn send_event(&self, kind: TouchEventKind, num_slot: u64, x: f64, y: f64) -> zbus::Result<()>;
 
-    #[dbus_proxy(property)]
+    #[zbus(property)]
     fn max_slots(&self) -> zbus::Result<i32>;
 }

qemu-rdp/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "qemu-rdp"
 version = "0.1.0"
-authors = ["Mihnea Buzatu <mihneabuzatu88@gmail.com>"]
+authors = [
+    "Mihnea Buzatu <mihneabuzatu88@gmail.com>",
+    "Marc-André Lureau <marcandre.lureau@redhat.com>",
+]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -23,6 +26,6 @@ ironrdp = { git = "https://github.com/Devolutions/IronRDP", features = [
     "svc",
     "cliprdr",
     "displaycontrol",
-    "rdpsnd"
+    "rdpsnd",
 ] }
 futures-util = "0.3"

qemu-rdp/src/main.rs

@@ -14,7 +14,7 @@ async fn main() -> Result<(), anyhow::Error> {
     let dbus = match args.dbus_address.take() {
         None => zbus::Connection::session().await,
         Some(addr) => {
-            zbus::ConnectionBuilder::address(addr.as_str())?
+            zbus::connection::Builder::address(addr.as_str())?
                 .build()
                 .await
         }

qemu-rdw/src/main.rs

@@ -42,9 +42,9 @@ async fn display_from_opt(opt: Rc<RefCell<AppOptions>>) -> Option<Display<'stati
         return Some(Display::new_qmp(qmp_addr).await.unwrap());
     }
     let builder = if let Some(addr) = &opt.borrow().address {
-        zbus::ConnectionBuilder::address(addr.as_str())
+        zbus::connection::Builder::address(addr.as_str())
     } else {
-        zbus::ConnectionBuilder::session()
+        zbus::connection::Builder::session()
     };
     let conn = builder
         .unwrap()