window: deps: upgrade to xcb 1.1

Was a bit fiddly. Eliminated the xcb_util crate refs: #1952
wez · May 7, 2022 · abc42f7 · abc42f7
1 parent b25d4d2
commit abc42f7
Show file tree

Hide file tree

Showing 12 changed files with 952 additions and 847 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/window/Cargo.toml b/window/Cargo.toml
@@ -67,18 +67,16 @@ winreg = "0.10"
 dirs-next = "2.0"
 filedescriptor = { version="0.8", path = "../filedescriptor" }
 x11 = {version ="2.18", features = ["xlib_xcb"]}
-xcb = {version="0.9", features=["render", "randr", "xkb", "xlib_xcb"]}
-xcb-util = { features = [ "cursor", "image", "icccm", "ewmh", "keysyms"], version = "0.3" }
-xkbcommon = { version = "0.5", features = ["x11", "wayland"], git="https://github.com/wez/xkbcommon-rs.git", rev="5cc8f233ac2b8bfa0d7a26fd981b77e68c3f2219"}
-#xkbcommon = { version = "0.5", features = ["x11", "wayland"], path="../../xkbcommon-rs" }
+xcb = {version="1.1", features=["render", "randr", "xkb", "xlib_xcb"]}
+xkbcommon = { version = "0.6", features = ["x11", "wayland"], git="https://github.com/wez/xkbcommon-rs.git", rev="69a29877e99369b4ec74703d3193b6dd694145e9"}
+#xkbcommon = { version = "0.6", features = ["x11", "wayland"], path="../../xkbcommon-rs" }
 mio = {version="0.8", features=["os-ext"]}
 libc = "0.2"
 smithay-client-toolkit = {version = "0.15", default-features=false, optional=true}
 wayland-protocols = {version="0.29", optional=true}
 wayland-client = {version="0.29", optional=true}
 wayland-egl = {version="0.29", optional=true}
-xcb-imdkit = "0.1"
-#xcb-imdkit = { path = "../../github/xcb-imdkit-rs" }
+xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", rev="7498cce1085ec23535f1b8d6729407485bf66c00"}
 
 [target.'cfg(target_os="macos")'.dependencies]
 cocoa = "0.20"