Upgrade dependencies

This commit is contained in:
Victor Berger 2019-02-24 08:50:21 +01:00 committed by Victor Berger
parent f34cf4b068
commit 5768e1fd87
3 changed files with 22 additions and 22 deletions

View File

@ -15,31 +15,31 @@ wayland-server = { version = "0.23", optional = true }
wayland-commons = { version = "0.23", optional = true } wayland-commons = { version = "0.23", optional = true }
wayland-sys = { version = "0.23", optional = true } wayland-sys = { version = "0.23", optional = true }
calloop = "0.4.2" calloop = "0.4.2"
nix = "0.11" nix = "0.13"
xkbcommon = "0.2.1" xkbcommon = "0.4.0"
tempfile = "2.1.5" tempfile = "3.0"
slog = "2.1.1" slog = "2.1.1"
slog-stdlog = "3.0.2" slog-stdlog = "3.0.2"
libloading = "0.4.0" libloading = "0.5.0"
wayland-client = { version = "0.23", features = ["egl"], optional = true } wayland-client = { version = "0.23", features = ["egl"], optional = true }
winit = { version = "0.18.0", optional = true } winit = { version = "0.18.0", optional = true }
drm = { version = "^0.3.4", optional = true } drm = { version = "^0.3.4", optional = true }
gbm = { version = "^0.5.0", optional = true, default-features = false, features = ["drm-support"] } gbm = { version = "^0.5.0", optional = true, default-features = false, features = ["drm-support"] }
glium = { version = "0.19.0", optional = true, default-features = false } glium = { version = "0.23.0", optional = true, default-features = false }
input = { version = "0.4.1", optional = true } input = { version = "0.4.1", optional = true }
udev = { version = "0.2.0", optional = true } udev = { version = "0.2.0", optional = true }
dbus = { version = "0.6.1", optional = true } dbus = { version = "0.6.1", optional = true }
systemd = { version = "^0.2.0", optional = true } systemd = { version = "0.4.0", optional = true }
wayland-protocols = { version = "0.23", features = ["unstable_protocols", "server"], optional = true } wayland-protocols = { version = "0.23", features = ["unstable_protocols", "server"], optional = true }
image = { version = "0.17.0", optional = true } image = { version = "0.21.0", optional = true }
error-chain = "0.11.0" error-chain = "0.12.0"
lazy_static = "1.0.0" lazy_static = "1.0.0"
[dev-dependencies] [dev-dependencies]
slog-term = "2.3" slog-term = "2.3"
[build-dependencies] [build-dependencies]
gl_generator = { version = "0.9", optional = true } gl_generator = { version = "0.10", optional = true }
[features] [features]
default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session", "renderer_glium", "xwayland", "wayland_frontend"] default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session", "renderer_glium", "xwayland", "wayland_frontend"]

View File

@ -10,10 +10,10 @@ edition = "2018"
slog = { version = "2.1.1" } slog = { version = "2.1.1" }
slog-term = "2.3" slog-term = "2.3"
slog-async = "2.2" slog-async = "2.2"
rand = "0.3" rand = "0.6"
glium = { version = "0.19.0", default-features = false } glium = { version = "0.23.0", default-features = false }
wayland-server = "0.23" wayland-server = "0.23"
xkbcommon = "0.2.1" xkbcommon = "0.4.0"
[dependencies.smithay] [dependencies.smithay]
path = ".." path = ".."
@ -21,7 +21,7 @@ default-features = false
features = [ "renderer_glium", "backend_egl", "wayland_frontend" ] features = [ "renderer_glium", "backend_egl", "wayland_frontend" ]
[build-dependencies] [build-dependencies]
gl_generator = "0.9" gl_generator = "0.10"
[features] [features]
default = [ "winit", "egl", "udev" ] default = [ "winit", "egl", "udev" ]

View File

@ -76,11 +76,11 @@ pub fn init_shell(
move |shell_event| match shell_event { move |shell_event| match shell_event {
XdgRequest::NewToplevel { surface } => { XdgRequest::NewToplevel { surface } => {
// place the window at a random location in the [0;800]x[0;800] square // place the window at a random location in the [0;800]x[0;800] square
use rand::distributions::{IndependentSample, Range}; use rand::distributions::{Distribution, Uniform};
let range = Range::new(0, 800); let range = Uniform::new(0, 800);
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let x = range.ind_sample(&mut rng); let x = range.sample(&mut rng);
let y = range.ind_sample(&mut rng); let y = range.sample(&mut rng);
surface.send_configure(ToplevelConfigure { surface.send_configure(ToplevelConfigure {
size: None, size: None,
states: vec![], states: vec![],
@ -111,12 +111,12 @@ pub fn init_shell(
kind: ShellSurfaceKind::Toplevel, kind: ShellSurfaceKind::Toplevel,
} = req } = req
{ {
// place the window at a random location in the [0;300]x[0;300] square // place the window at a random location in the [0;800]x[0;800] square
use rand::distributions::{IndependentSample, Range}; use rand::distributions::{Distribution, Uniform};
let range = Range::new(0, 300); let range = Uniform::new(0, 800);
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let x = range.ind_sample(&mut rng); let x = range.sample(&mut rng);
let y = range.ind_sample(&mut rng); let y = range.sample(&mut rng);
surface.send_configure((0, 0), wl_shell_surface::Resize::None); surface.send_configure((0, 0), wl_shell_surface::Resize::None);
shell_window_map shell_window_map
.borrow_mut() .borrow_mut()