Adapt to no longer renamed ffi crates

Author: bilelmoussaoui

Cargo.toml

@@ -58,6 +58,9 @@ libc = "0.2"
 pango-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.20", branch = "master", features = ["v1_46"]}
 pango = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.20", branch = "master", features = ["v1_46"]}
 gir-format-check = "^0.1"
+gdk4-x11-sys = {path = "gdk4-x11/sys", version = "0.9"}
+gdk4-wayland-sys = {path = "gdk4-wayland/sys", version = "0.9"}
+gdk4-win32-sys = {path = "gdk4-win32/sys", version = "0.9"}
 gdk4-sys = {path = "gdk4/sys", version = "0.9"}
 gdk = {package = "gdk4", path = "gdk4", version = "0.9"}
 gsk4-sys = {path = "gsk4/sys", version = "0.9"}

gdk4-wayland/Cargo.toml

@@ -14,15 +14,15 @@ rust-version.workspace = true
 version.workspace = true
 
 [features]
-v4_4 = ["ffi/v4_4", "gdk/v4_4"]
-v4_10 = ["ffi/v4_10", "v4_4", "gdk/v4_10"]
-v4_12 = ["ffi/v4_12", "v4_10", "gdk/v4_12"]
-v4_16 = ["ffi/v4_16", "v4_12", "gdk/v4_16"]
+v4_4 = ["gdk4-wayland-sys/v4_4", "gdk/v4_4"]
+v4_10 = ["gdk4-wayland-sys/v4_10", "v4_4", "gdk/v4_10"]
+v4_12 = ["gdk4-wayland-sys/v4_12", "v4_10", "gdk/v4_12"]
+v4_16 = ["gdk4-wayland-sys/v4_16", "v4_12", "gdk/v4_16"]
 wayland_crate = ["wayland-client", "wayland-backend"]
 egl = ["khronos-egl"]
 
 [dependencies]
-ffi = {path = "./sys", package = "gdk4-wayland-sys", version = "0.9"}
+gdk4-wayland-sys.workspace = true
 gdk.workspace=  true
 gio.workspace = true
 glib.workspace = true

gdk4-wayland/src/lib.rs

@@ -4,8 +4,8 @@
 #![allow(deprecated)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-pub use ffi;
 pub use gdk;
+pub use gdk4_wayland_sys as ffi;
 pub use gio;
 pub use glib;
 #[cfg(all(feature = "v4_4", feature = "egl"))]

gdk4-wayland/src/wayland_device.rs

@@ -11,10 +11,10 @@ use wayland_client::{
     Proxy,
 };
 
+use crate::WaylandDevice;
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use crate::prelude::*;
-use crate::WaylandDevice;
+use crate::{ffi, prelude::*};
 
 impl WaylandDevice {
     #[doc(alias = "gdk_wayland_device_get_wl_keyboard")]

gdk4-wayland/src/wayland_display.rs

@@ -1,5 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#[cfg(feature = "wayland_crate")]
+#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
+use crate::ffi;
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
 use glib::{prelude::*, translate::*, Quark};

gdk4-wayland/src/wayland_monitor.rs

@@ -5,7 +5,10 @@
 use wayland_client::{backend::ObjectId, protocol::wl_output::WlOutput, Proxy};
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use {crate::prelude::*, glib::translate::*};
+use {
+    crate::{ffi, prelude::*},
+    glib::translate::*,
+};
 
 use crate::WaylandMonitor;
 

gdk4-wayland/src/wayland_seat.rs

@@ -5,7 +5,10 @@
 use wayland_client::{backend::ObjectId, protocol::wl_seat::WlSeat, Proxy};
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use {crate::prelude::*, glib::translate::*};
+use {
+    crate::{ffi, prelude::*},
+    glib::translate::*,
+};
 
 use crate::WaylandSeat;
 

gdk4-wayland/src/wayland_surface.rs

@@ -7,7 +7,7 @@ use glib::translate::*;
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
 use wayland_client::{backend::ObjectId, protocol::wl_surface::WlSurface, Proxy};
 
-use crate::{prelude::*, WaylandSurface};
+use crate::{ffi, prelude::*, WaylandSurface};
 
 mod sealed {
     pub trait Sealed {}

gdk4-wayland/src/wayland_toplevel.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::WaylandToplevel;
+use crate::{ffi, WaylandToplevel};
 use glib::translate::*;
 use std::boxed::Box as Box_;
 

gdk4-win32/Cargo.toml

@@ -18,12 +18,12 @@ name = "gtk4-win32"
 version = "4"
 
 [features]
-v4_4 = ["ffi/v4_4", "gdk/v4_4"]
+v4_4 = ["gdk4-win32-sys/v4_4", "gdk/v4_4"]
 egl = ["khronos-egl"]
 win32 = ["windows"]
 
 [dependencies]
-ffi = { path = "./sys", version = "0.9", package = "gdk4-win32-sys"}
+gdk4-win32-sys.workspace = true
 gdk.workspace = true
 gio.workspace = true
 glib.workspace = true