From 9cd900b23f78002294b2b09afe630abbc475e83f Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Tue, 25 Oct 2022 16:21:22 -0400
Subject: [PATCH] fix(wayland): remove wayland crate pinning

---
 Cargo.toml               | 2 --
 src/wayland/mod.rs       | 7 ++-----
 src/wayland/xdg_shell.rs | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d13c60f..538cbe0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,8 +33,6 @@ slog = "2.7.0"
 slog-stdlog = "4.1.1"
 xkbcommon = { version = "0.5.0", default-features = false }
 stardust-xr = "0.5.2"
-wayland-backend = "=0.1.0-beta.9"
-wayland-scanner = "=0.30.0-beta.9"
 directories = "4.0.1"
 serde = { version = "1.0.145", features = ["derive"] }
 
diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs
index 0428073..e6f2dae 100644
--- a/src/wayland/mod.rs
+++ b/src/wayland/mod.rs
@@ -22,10 +22,7 @@ use smithay::{
 use std::os::unix::prelude::AsRawFd;
 use std::{
 	ffi::c_void,
-	os::unix::{
-		net::UnixListener,
-		prelude::{FromRawFd, RawFd},
-	},
+	os::unix::{net::UnixListener, prelude::FromRawFd},
 	sync::Arc,
 };
 use stereokit as sk;
@@ -114,7 +111,7 @@ impl Wayland {
 		let listen_async =
 			AsyncUnixListener::from_std(unsafe { UnixListener::from_raw_fd(socket.as_raw_fd()) })?;
 
-		let dispatch_poll_fd: RawFd = display.lock().backend().poll_fd();
+		let dispatch_poll_fd = display.lock().backend().poll_fd().try_clone_to_owned()?;
 		let dispatch_poll_listener = AsyncFd::new(dispatch_poll_fd)?;
 
 		let dh1 = display.lock().handle();
diff --git a/src/wayland/xdg_shell.rs b/src/wayland/xdg_shell.rs
index 61e2b56..d5abff2 100644
--- a/src/wayland/xdg_shell.rs
+++ b/src/wayland/xdg_shell.rs
@@ -28,8 +28,7 @@ impl XdgShellHandler for WaylandState {
 	}
 
 	fn new_toplevel(&mut self, surface: ToplevelSurface) {
-		self.output
-			.enter(&self.display_handle, surface.wl_surface());
+		self.output.enter(surface.wl_surface());
 		surface.with_pending_state(|state| {
 			state.states.set(State::Maximized);
 			state.states.set(State::Activated);