diff --git a/Cargo.toml b/Cargo.toml index eba5dad..1242a90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,23 +16,23 @@ wayland-commons = { version = "0.25.0", optional = true } wayland-sys = { version = "0.25.0", optional = true } calloop = "0.5.1" bitflags = "1" -nix = "0.15" +nix = "0.17" xkbcommon = "0.4.0" tempfile = "3.0" -slog = "2.1.1" -slog-stdlog = "3.0.2" -libloading = "0.5.0" +slog = "2" +slog-stdlog = "4" +libloading = "0.6.0" wayland-egl = { version = "0.25.0", optional = true } winit = { version = "0.22.0", optional = true } drm = { version = "^0.4.0", git = "https://github.com/drakulix/drm-rs", branch = "develop", optional = true } gbm = { version = "^0.6.0", git = "https://github.com/drakulix/gbm.rs", branch = "develop", optional = true, default-features = false, features = ["drm-support"] } -glium = { version = "0.23.0", optional = true, default-features = false } +glium = { version = "0.27.0", optional = true, default-features = false } input = { version = "0.5", default-features = false, optional = true } udev = { version = "0.4", optional = true } dbus = { version = "0.8", optional = true } systemd = { version = "0.4.0", optional = true } wayland-protocols = { version = "0.25.0", features = ["unstable_protocols", "server"], optional = true } -image = { version = "0.21.0", optional = true } +image = { version = "0.23.0", optional = true } lazy_static = "1.0.0" thiserror = "1" # TODO: remove as soon as drm-rs provides an error implementing Error @@ -42,7 +42,7 @@ failure = { version = "0.1", optional = true } slog-term = "2.3" [build-dependencies] -gl_generator = { version = "0.10", optional = true } +gl_generator = { version = "0.14", optional = true } [features] default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml index 8cbd009..4d42e65 100644 --- a/anvil/Cargo.toml +++ b/anvil/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" slog = { version = "2.1.1" } slog-term = "2.3" slog-async = "2.2" -rand = "0.6" -glium = { version = "0.23.0", default-features = false } +rand = "0.7" +glium = { version = "0.27.0", default-features = false } wayland-server = "0.25.0" xkbcommon = "0.4.0" bitflags = "1.2.1" @@ -23,7 +23,7 @@ default-features = false features = [ "renderer_glium", "backend_egl", "wayland_frontend" ] [build-dependencies] -gl_generator = "0.10" +gl_generator = "0.14" [features] default = [ "winit", "egl", "udev", "logind" ] diff --git a/src/xwayland/xserver.rs b/src/xwayland/xserver.rs index c6f9ce8..a2ce2d8 100644 --- a/src/xwayland/xserver.rs +++ b/src/xwayland/xserver.rs @@ -392,7 +392,10 @@ fn exec_xwayland( } // run it - let ret = ::nix::unistd::execvp(&CString::new("Xwayland").unwrap(), &args)?; + let ret = ::nix::unistd::execvp( + &CString::new("Xwayland").unwrap(), + &args.iter().map(AsRef::as_ref).collect::>(), + )?; // small dance to actually return Void match ret {} }