alex/rust_minifb
1
0
Fork 0
mirror of https://github.com/italicsjenga/rust_minifb.git synced 2024-10-17 05:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Revert bump of xkbcommon-sys (#268)

Browse source 
`xkb` still depends on the previous version
and there are some issues in the new version
https://github.com/meh/rust-xkbcommon-sys/issues/7
This commit is contained in:
vemoo 2021-12-07 07:24:30 +01:00 committed by GitHub
parent 0f7d175621
commit 49aad5c586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -48,7 +48,7 @@ wayland-protocols = { version = "0.29", features = ["client", "unstable_protocol
wayland-cursor = {version = "0.29", optional = true} wayland-cursor = {version = "0.29", optional = true}
tempfile = {version = "3.2", optional = true} tempfile = {version = "3.2", optional = true}
xkb = {version = "0.2.1", optional = true} xkb = {version = "0.2.1", optional = true}
xkbcommon-sys = {version = "1.3", optional = true} xkbcommon-sys = {version = "0.7.5", optional = true}
x11-dl = {version = "2.19.1", optional = true} x11-dl = {version = "2.19.1", optional = true}
libc = {version = "0.2.107", optional = true} libc = {version = "0.2.107", optional = true}

6
src/os/posix/wayland.rs
View file

@ -1072,14 +1072,12 @@ impl Window {
v.set_len(len as usize); v.set_len(len as usize);
file.read_exact(&mut v)?; file.read_exact(&mut v)?;
let ctx = xkbcommon_sys::xkb_context_new( let ctx = xkbcommon_sys::xkb_context_new(0);
xkbcommon_sys::xkb_context_flags::XKB_CONTEXT_NO_FLAGS,
);
let kb_map_ptr = xkbcommon_sys::xkb_keymap_new_from_string( let kb_map_ptr = xkbcommon_sys::xkb_keymap_new_from_string(
ctx, ctx,
v.as_ptr() as *const _ as *const std::os::raw::c_char, v.as_ptr() as *const _ as *const std::os::raw::c_char,
xkbcommon_sys::xkb_keymap_format::XKB_KEYMAP_FORMAT_TEXT_V1, xkbcommon_sys::xkb_keymap_format::XKB_KEYMAP_FORMAT_TEXT_V1,
xkbcommon_sys::xkb_keymap_compile_flags::XKB_KEYMAP_COMPILE_NO_FLAGS, 0,
); );
// Wrap keymap // Wrap keymap