Skip to content

Commit 6fea44c

Browse files
gdk-wayland: Drop the xkb feature
It fails to build because of meh/rust-xkb#8 We might remove that feature or replace it somehow The commit could also be reverted once upstream gets a new fixed release but for now, this breaks the docs (using --all-features) & CI
1 parent a9fce68 commit 6fea44c

File tree

6 files changed

+4
-31
lines changed

6 files changed

+4
-31
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- { name: "gdk4", features: "v4_14,gl", test_sys: true }
5151
- {
5252
name: "gdk4-wayland",
53-
features: "v4_12,wayland_crate,egl,xkb_crate",
53+
features: "v4_12,wayland_crate,egl",
5454
test_sys: true,
5555
}
5656
- { name: "gdk4-x11", features: "v4_4,xlib,egl", test_sys: false }

gdk4-wayland/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ v4_10 = ["ffi/v4_10", "v4_4", "gdk/v4_10"]
1818
v4_12 = ["ffi/v4_12", "v4_10", "gdk/v4_12"]
1919
wayland_crate = ["wayland-client", "wayland-backend"]
2020
egl = ["khronos-egl"]
21-
xkb_crate = ["xkb"]
2221

2322
[package.metadata.docs.rs]
2423
all-features = true
@@ -34,7 +33,6 @@ libc = "0.2"
3433
wayland-client = {version = "0.31.0", optional = true}
3534
wayland-backend = {version = "0.3.0", optional = true, features = ["client_system"]}
3635
khronos-egl = {version = "6.0", optional = true}
37-
xkb = {version = "0.3", optional = true}
3836

3937
[dev-dependencies]
4038
gir-format-check = "^0.1"

gdk4-wayland/Gir.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ status = "generate"
7272
manual = true
7373
[[object.function]]
7474
name = "get_xkb_keymap"
75-
manual = true
75+
ignore = true
7676

7777
[[object]]
7878
name = "GdkWayland.WaylandDisplay"

gdk4-wayland/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ gdk-wayland = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4-w
4848
| `v4_4` | Enable the new APIs part of GTK 4.4 |
4949
| `wayland_crate` | Integration with the [wayland-client](https://crates.io/crates/wayland-client) crate |
5050
| `egl` | Integration with the [khronos-egl](https://crates.io/crates/khronos-egl) crate |
51-
| `xkb_crate` | Integration with [xkb](https://crates.io/crates/xkb) crate |
5251

5352
### See Also
5453

gdk4-wayland/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ pub use khronos_egl;
1313
#[cfg(feature = "wayland_crate")]
1414
#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
1515
pub use wayland_client;
16-
#[cfg(all(feature = "v4_4", feature = "xkb_crate"))]
17-
#[cfg_attr(docsrs, doc(cfg(all(feature = "v4_4", feature = "xkb_crate"))))]
18-
pub use xkb;
1916

2017
mod auto;
2118

gdk4-wayland/src/wayland_device.rs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// Take a look at the license at the top of the repository in the LICENSE file.
22

3-
#[cfg(any(feature = "wayland_crate", feature = "xkb_crate"))]
4-
#[cfg_attr(
5-
docsrs,
6-
doc(cfg(any(feature = "wayland_crate", feature = "xkb_crate")))
7-
)]
3+
#[cfg(feature = "wayland_crate")]
4+
#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
85
use glib::translate::*;
96
#[cfg(feature = "wayland_crate")]
107
#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
@@ -13,9 +10,6 @@ use wayland_client::{
1310
protocol::{wl_keyboard::WlKeyboard, wl_pointer::WlPointer, wl_seat::WlSeat},
1411
Proxy,
1512
};
16-
#[cfg(all(feature = "v4_4", feature = "xkb_crate"))]
17-
#[cfg_attr(docsrs, doc(cfg(all(feature = "v4_4", feature = "xkb_crate"))))]
18-
use xkb::Keymap;
1913

2014
#[cfg(feature = "wayland_crate")]
2115
#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
@@ -80,19 +74,4 @@ impl WaylandDevice {
8074
}
8175
}
8276
}
83-
84-
#[cfg(all(feature = "v4_4", feature = "xkb_crate"))]
85-
#[cfg_attr(docsrs, doc(cfg(all(feature = "v4_4", feature = "xkb_crate"))))]
86-
#[doc(alias = "gdk_wayland_device_get_xkb_keymap")]
87-
#[doc(alias = "get_xkb_keymap")]
88-
pub fn xkb_keymap(&self) -> Option<Keymap> {
89-
unsafe {
90-
let ptr = ffi::gdk_wayland_device_get_xkb_keymap(self.to_glib_none().0);
91-
if ptr.is_null() {
92-
None
93-
} else {
94-
Some(Keymap::from_ptr(ptr as _))
95-
}
96-
}
97-
}
9877
}

0 commit comments

Comments
 (0)