Adapt to no longer renamed ffi crates

Author: bilelmoussaoui

Cargo.toml

@@ -48,6 +48,9 @@ gio-sys = { path = "gio/sys", version = "0.20" }
 gio = { path = "gio", version = "0.20" }
 pango-sys = { path = "pango/sys", version = "0.20" }
 pango = { path = "pango", version = "0.20" }
+pangocairo-sys = { path = "pangocairo/sys", version = "0.20" }
 cairo-sys-rs = { path = "cairo/sys", version = "0.20" }
 cairo-rs = { path = "cairo", version = "0.20" }
 glib-macros = { path = "glib-macros", version = "0.20" }
+gdk-pixbuf-sys = { path = "gdk-pixbuf/sys", version = "0.20" }
+graphene-sys = { path = "graphene/sys", version = "0.20" }

cairo/Cargo.toml

@@ -17,26 +17,26 @@ version.workspace = true
 name = "cairo"
 
 [features]
-png = ["ffi/png"]
-pdf = ["ffi/pdf"]
-svg = ["ffi/svg"]
-ps = ["ffi/ps"]
-use_glib = ["glib", "ffi/use_glib"]
-v1_16 = ["ffi/v1_16"]
-v1_18 = ["v1_16", "ffi/v1_18"]
+png = ["cairo-sys-rs/png"]
+pdf = ["cairo-sys-rs/pdf"]
+svg = ["cairo-sys-rs/svg"]
+ps = ["cairo-sys-rs/ps"]
+use_glib = ["glib", "cairo-sys-rs/use_glib"]
+v1_16 = ["cairo-sys-rs/v1_16"]
+v1_18 = ["v1_16", "cairo-sys-rs/v1_18"]
 default = ["use_glib"]
-freetype = ["ffi/freetype", "freetype-rs"]
-script = ["ffi/script"]
-xcb = ["ffi/xcb"]
-xlib = ["ffi/xlib"]
-win32-surface = ["ffi/win32-surface"]
+freetype = ["cairo-sys-rs/freetype", "freetype-rs"]
+script = ["cairo-sys-rs/script"]
+xcb = ["cairo-sys-rs/xcb"]
+xlib = ["cairo-sys-rs/xlib"]
+win32-surface = ["cairo-sys-rs/win32-surface"]
 
 [dependencies.glib]
 optional = true
 workspace = true
 
 [dependencies]
-ffi = { package = "cairo-sys-rs", path = "sys", version = "0.20" }
+cairo-sys-rs.workspace = true
 libc.workspace = true
 bitflags.workspace = true
 thiserror.workspace = true

cairo/src/context.rs

@@ -8,15 +8,13 @@ use std::{ffi::CString, fmt, mem::MaybeUninit, ops, ptr, slice};
 use glib::translate::*;
 
 use crate::{
-    ffi::{cairo_rectangle_list_t, cairo_t},
-    utils::status_to_result,
-    Antialias, Content, Error, FillRule, FontExtents, FontFace, FontOptions, FontSlant, FontWeight,
-    Glyph, LineCap, LineJoin, Matrix, Operator, Path, Pattern, Rectangle, ScaledFont, Surface,
-    TextCluster, TextClusterFlags, TextExtents,
+    ffi, utils::status_to_result, Antialias, Content, Error, FillRule, FontExtents, FontFace,
+    FontOptions, FontSlant, FontWeight, Glyph, LineCap, LineJoin, Matrix, Operator, Path, Pattern,
+    Rectangle, ScaledFont, Surface, TextCluster, TextClusterFlags, TextExtents,
 };
 
 pub struct RectangleList {
-    ptr: *mut cairo_rectangle_list_t,
+    ptr: *mut ffi::cairo_rectangle_list_t,
 }
 
 impl ops::Deref for RectangleList {
@@ -55,7 +53,7 @@ impl fmt::Debug for RectangleList {
 
 #[derive(Debug)]
 #[repr(transparent)]
-pub struct Context(ptr::NonNull<cairo_t>);
+pub struct Context(ptr::NonNull<ffi::cairo_t>);
 
 #[cfg(feature = "use_glib")]
 #[cfg_attr(docsrs, doc(cfg(feature = "use_glib")))]
@@ -112,7 +110,7 @@ impl FromGlibPtrFull<*mut ffi::cairo_t> for Context {
 #[cfg(feature = "use_glib")]
 gvalue_impl!(
     Context,
-    cairo_t,
+    ffi::cairo_t,
     ffi::gobject::cairo_gobject_context_get_type
 );
 

cairo/src/device.rs

@@ -11,7 +11,7 @@ use std::ptr;
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
-use crate::{utils::status_to_result, DeviceType, Error};
+use crate::{ffi, utils::status_to_result, DeviceType, Error};
 #[cfg(feature = "script")]
 use crate::{Content, RecordingSurface, ScriptMode, Surface};
 

cairo/src/enums.rs

@@ -5,7 +5,7 @@ use std::fmt::Debug;
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
-use crate::Error;
+use crate::{ffi, Error};
 
 // Helper macro for our GValue related trait impls
 #[cfg(feature = "use_glib")]

cairo/src/error.rs

@@ -2,6 +2,7 @@
 
 use std::{fmt::Debug, io};
 
+use crate::ffi;
 use thiserror::Error;
 
 #[derive(Error, Debug, Clone, PartialEq, Copy, Eq)]

cairo/src/font/font_extents.rs

@@ -1,5 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::ffi;
 use std::fmt;
 
 #[derive(Clone, Copy)]

cairo/src/font/font_face.rs

@@ -11,7 +11,7 @@ use glib::translate::*;
 
 #[cfg(feature = "freetype")]
 use crate::FtSynthesize;
-use crate::{utils::status_to_result, Error, FontSlant, FontType, FontWeight};
+use crate::{ffi, utils::status_to_result, Error, FontSlant, FontType, FontWeight};
 
 #[cfg(feature = "freetype")]
 static FT_FACE_KEY: crate::UserDataKey<freetype::face::Face> = crate::UserDataKey::new();

cairo/src/font/font_options.rs

@@ -11,7 +11,9 @@ use glib::translate::*;
 
 #[cfg(feature = "v1_16")]
 use crate::font::font_face::to_optional_string;
-use crate::{utils::status_to_result, Antialias, Error, HintMetrics, HintStyle, SubpixelOrder};
+use crate::{
+    ffi, utils::status_to_result, Antialias, Error, HintMetrics, HintStyle, SubpixelOrder,
+};
 
 #[cfg(feature = "use_glib")]
 glib::wrapper! {

cairo/src/font/glyph.rs

@@ -1,5 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::ffi;
 use std::fmt;
 
 #[derive(Clone, Copy)]