diff --git a/Cargo.lock b/Cargo.lock index 262d11293..2581d9cae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4312,9 +4312,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -7199,20 +7199,21 @@ dependencies = [ [[package]] name = "xcb" -version = "1.2.1" -source = "git+https://github.com/rust-x-bindings/rust-xcb?rev=dbdaa01c178c6fbe68bd51b7ad44c08172181083#dbdaa01c178c6fbe68bd51b7ad44c08172181083" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262" dependencies = [ "as-raw-xcb-connection", "bitflags 1.3.2", "libc", - "quick-xml 0.28.2", + "quick-xml 0.30.0", "x11", ] [[package]] name = "xcb-imdkit" version = "0.2.0" -source = "git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix#e59e4a6df065b702e0c22fa2dcea00bd8301a446" +source = "git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix-xcb-1.3#1fce4c3f04339b02f87384132703d9f08e0b65ea" dependencies = [ "bitflags 1.3.2", "cc", diff --git a/Cargo.toml b/Cargo.toml index 6422e0503..ccc935819 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,8 +28,6 @@ opt-level = 3 #split-debuginfo = "unpacked" [patch.crates-io] -xcb = {git="https://github.com/rust-x-bindings/rust-xcb", rev="dbdaa01c178c6fbe68bd51b7ad44c08172181083"} # waiting on a release with https://github.com/rust-x-bindings/rust-xcb/pull/230 - # We use our own vendored cairo, which has minimal deps and should just # build via cargo. cairo-sys-rs = {path="deps/cairo", version="0.18.0"} diff --git a/window/Cargo.toml b/window/Cargo.toml index 4f5b21d0a..6b24e86f5 100644 --- a/window/Cargo.toml +++ b/window/Cargo.toml @@ -71,7 +71,7 @@ winreg = "0.10" dirs-next = "2.0" filedescriptor = { version="0.8", path = "../filedescriptor" } x11 = {version ="2.21", features = ["xlib_xcb", "xlib"]} -xcb = {version="1.2", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present", "as-raw-xcb-connection"]} +xcb = {version="1.3", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present", "as-raw-xcb-connection"]} xkbcommon = { version = "0.7.0", features = ["x11", "wayland"] } mio = {version="0.8", features=["os-ext"]} libc = "0.2" @@ -79,7 +79,7 @@ smithay-client-toolkit = {version = "0.16.1", default-features=false, optional=t wayland-protocols = {version="0.29", optional=true} wayland-client = {version="0.29", optional=true} wayland-egl = {version="0.29", optional=true} -xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix"} +xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix-xcb-1.3"} zbus = "3.13" zvariant = "3.14" futures-util = "0.3"