Auto merge of #247 - atomgardner:update-winit, r=jdm

Bump winit to 0.28.1 This fixes the following wayland-client error: Attempted to dispatch unknown opcode 0 for wl_shm, aborting.
servo · Feb 21, 2023 · 64df6b2 · 64df6b2 · Snowiiii · Feb 21, 2023
2 parents 7391b66 + 97f4604
commit 64df6b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/android-example/rust/Cargo.toml b/android-example/rust/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [lib]
+name = "main"
 crate_type = ["cdylib"]
 
 [profile.dev]
@@ -18,6 +19,7 @@ android_logger = "0.8"
 gl = "0.14"
 jni = "0.13"
 log = "0.4"
+winit = { version = "0.28.1", features = [ "android-native-activity" ] }
 
 [dependencies.euclid]
 version = "0.22"

diff --git a/surfman/Cargo.toml b/surfman/Cargo.toml
@@ -44,11 +44,11 @@ version = "0.1"
 optional = true
 
 [dependencies.winit]
-version = "0.24.0"
+version = "0.28.1"
 optional = true
 
 [dependencies.raw-window-handle]
-version = "0.3.3"
+version = "0.5"
 optional = true
 
 [dev-dependencies]
@@ -88,4 +88,5 @@ wio = "0.2"
 winapi = { version = "0.3", features = ["d3d11", "wingdi", "winuser", "libloaderapi"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-"raw-window-handle" = "0.3.3"
+raw-window-handle = "0.5"
+winit = { version = "0.28.1", features = [ "android-native-activity" ] }
diff --git a/surfman/src/platform/android/connection.rs b/surfman/src/platform/android/connection.rs
@@ -117,9 +117,9 @@ impl Connection {
         window: &Window,
     ) -> Result<NativeWidget, Error> {
         use raw_window_handle::HasRawWindowHandle;
-        use raw_window_handle::RawWindowHandle::Android;
+        use raw_window_handle::RawWindowHandle::AndroidNdk;
         match window.raw_window_handle() {
-            Android(handle) => Ok(NativeWidget {
+            AndroidNdk(handle) => Ok(NativeWidget {
                 native_window: handle.a_native_window as *mut _,
             }),
             _ => Err(Error::IncompatibleNativeWidget),

diff --git a/surfman/src/platform/unix/wayland/connection.rs b/surfman/src/platform/unix/wayland/connection.rs
@@ -18,7 +18,7 @@ use std::sync::Arc;
 use wayland_sys::client::{wl_display, wl_proxy, WAYLAND_CLIENT_HANDLE};
 
 #[cfg(feature = "sm-winit")]
-use winit::platform::unix::WindowExtUnix;
+use winit::platform::wayland::WindowExtWayland;
 #[cfg(feature = "sm-winit")]
 use winit::window::Window;
 

diff --git a/surfman/src/platform/unix/x11/connection.rs b/surfman/src/platform/unix/x11/connection.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 use x11::xlib::{Display, XCloseDisplay, XInitThreads, XLockDisplay, XOpenDisplay, XUnlockDisplay};
 
 #[cfg(feature = "sm-winit")]
-use winit::platform::unix::WindowExtUnix;
+use winit::platform::x11::WindowExtX11;
 #[cfg(feature = "sm-winit")]
 use winit::window::Window;