From 84865e4b680b13e8d08e7e5275d688277694683e Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 1 Oct 2019 00:25:09 +0000 Subject: [PATCH] servo: Merge #9339 - Upgrade servo-glutin to latest published version (0.4.7) (from frewsxcv:bump-glutin); r=SimonSapin servo/glutinservo-v0.4.5...servo-v0.4.7 The primary reason I'm updating servo-glutin is to indirectly pick up these changes: vberger/wayland-kbd#9 Daggerbot/x11-rs#32 ...which results in two fewer libc 0.1.x dependency servo#8608 Source-Repo: https://github.com/servo/servo Source-Revision: 6b81a72228b54f37028e9400808768bd0d52d69f UltraBlame original commit: 7b841a5bd541d3513329284db9aa2c70b1bb7972 --- servo/components/servo/Cargo.lock | 116 +++++++++++++++++++----------- servo/ports/cef/Cargo.lock | 116 +++++++++++++++++++----------- servo/ports/gonk/Cargo.lock | 114 +++++++++++++++++++---------- 3 files changed, 227 insertions(+), 119 deletions(-) diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index 511e7f633ca55..6f0c60c77ff34 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -321,6 +321,11 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "cssparser" version = "0.4.0" @@ -381,10 +386,10 @@ dependencies = [ [[package]] name = "dlib" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -557,6 +562,16 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "fs2" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "futf" version = "0.1.1" @@ -672,14 +687,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.4.2" @@ -718,7 +725,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1001,6 +1008,16 @@ name = "libc" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libloading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "libressl-pnacl-sys" version = "2.1.6" @@ -1063,6 +1080,17 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "memmap" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fs2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" version = "0.1.0" @@ -1088,15 +1116,6 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mmap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mozjs_sys" version = "0.0.0" @@ -1647,7 +1666,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1657,7 +1676,6 @@ dependencies = [ "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1668,12 +1686,11 @@ dependencies = [ "shared_library 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-window 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1691,7 +1708,7 @@ dependencies = [ "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1989,35 +2006,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.2.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-kbd" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-scanner" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-sys" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-window" -version = "0.1.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2097,11 +2133,11 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index 9b1929063902a..b763f9c118513 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -322,6 +322,11 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "cssparser" version = "0.4.0" @@ -382,10 +387,10 @@ dependencies = [ [[package]] name = "dlib" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -525,6 +530,16 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "fs2" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "futf" version = "0.1.1" @@ -631,14 +646,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.4.2" @@ -677,7 +684,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -960,6 +967,16 @@ name = "libc" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libloading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "libressl-pnacl-sys" version = "2.1.6" @@ -1022,6 +1039,17 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "memmap" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fs2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" version = "0.1.0" @@ -1047,15 +1075,6 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mmap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mozjs_sys" version = "0.0.0" @@ -1597,7 +1616,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1607,7 +1626,6 @@ dependencies = [ "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1618,12 +1636,11 @@ dependencies = [ "shared_library 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-window 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1641,7 +1658,7 @@ dependencies = [ "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1911,35 +1928,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.2.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-kbd" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-scanner" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-sys" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-window" -version = "0.1.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2019,11 +2055,11 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock index a8d0d0bc0c4a6..f4c5aa81084d8 100644 --- a/servo/ports/gonk/Cargo.lock +++ b/servo/ports/gonk/Cargo.lock @@ -303,6 +303,11 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "cssparser" version = "0.4.0" @@ -363,10 +368,10 @@ dependencies = [ [[package]] name = "dlib" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -516,6 +521,16 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "fs2" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "futf" version = "0.1.1" @@ -622,14 +637,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.4.2" @@ -931,6 +938,16 @@ name = "libc" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libloading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "libressl-pnacl-sys" version = "2.1.6" @@ -993,6 +1010,17 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "memmap" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fs2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" version = "0.1.0" @@ -1018,15 +1046,6 @@ dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mmap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mozjs_sys" version = "0.0.0" @@ -1566,7 +1585,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1576,7 +1595,6 @@ dependencies = [ "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1587,12 +1605,11 @@ dependencies = [ "shared_library 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-window 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1610,7 +1627,7 @@ dependencies = [ "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1880,35 +1897,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.2.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-kbd" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-scanner" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-sys" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dlib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-window" -version = "0.1.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1957,11 +1993,11 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]]