1
1
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 11:17:15 +03:00

Fix x11 compilation due to bad semver bump in xcb-util

Force using xcb-util 0.2.1 precisely because 0.2.2 pulls in a
conflicting major version of xcb (0.8 -> 0.9).

It's a non-trivial upgrade: the types around xkb are different
and features need to be specified in the manifest to enable compilation
of the things that we depend upon.

In addition, xkbdcommon, on which we depend, requires xcb 0.8 and
results in pulling in two conflicting versions of the crates.

It's a bit of a painful situation and will require some effort to
figure out how to upgrade the xcb dependency, when we're ready for that.

refs: https://github.com/meh/rust-xcb-util/issues/12
This commit is contained in:
Wez Furlong 2020-01-05 15:51:48 -08:00
parent 4687b3bb48
commit 048495b651

View File

@ -50,7 +50,8 @@ clipboard-win = "2.2"
filedescriptor = "0.6" filedescriptor = "0.6"
x11 = {version ="2.18", features = ["xlib_xcb"]} x11 = {version ="2.18", features = ["xlib_xcb"]}
xcb = "0.8" xcb = "0.8"
xcb-util = { features = [ "icccm", "ewmh", "keysyms", "shm"], version = "0.2" } # See: https://github.com/meh/rust-xcb-util/issues/12
xcb-util = { features = [ "icccm", "ewmh", "keysyms", "shm"], version = "=0.2.1" }
xkbcommon = { version = "0.4", features = ["x11"] } xkbcommon = { version = "0.4", features = ["x11"] }
mio = "0.6" mio = "0.6"
mio-extras = "2.0" mio-extras = "2.0"