diff options
author | Kalev Lember <klember@redhat.com> | 2022-11-24 14:35:26 +0100 |
---|---|---|
committer | Kalev Lember <klember@redhat.com> | 2022-11-24 15:27:39 +0100 |
commit | cd33ff25ad06877df3823e1a9ab5e9d3b41a4e58 (patch) | |
tree | 11fe890d8891bac7b9bce93bc5e2c69e95cf4401 | |
parent | 669a888bec641efc2b59cd605750582d6bb77244 (diff) | |
download | librsvg-cd33ff25ad06877df3823e1a9ab5e9d3b41a4e58.tar.gz |
Update the yeslogic-fontconfig-sys crate to 4.0.1
... and adapt tests/src/utils.rs for changed fontconfig_sys import
paths.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/773>
-rw-r--r-- | Cargo.lock | 25 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | tests/src/utils.rs | 13 |
3 files changed, 31 insertions, 9 deletions
@@ -521,6 +521,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading", +] + +[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -994,6 +1003,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] name = "librsvg" version = "2.55.0" dependencies = [ @@ -2668,10 +2687,12 @@ dependencies = [ [[package]] name = "yeslogic-fontconfig-sys" -version = "2.11.2" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e47154248a2dba5ca6965e26b1a59146210736ea9b862362b6d72682e57f8d" +checksum = "ec657fd32bbcbeaef5c7bc8e10b3db95b143fab8db0a50079773dbf936fd4f73" dependencies = [ "const-cstr", + "dlib", + "once_cell", "pkg-config", ] @@ -104,7 +104,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tempfile = "3" test-generator = "0.3" -yeslogic-fontconfig-sys = "2.11.1" +yeslogic-fontconfig-sys = "4.0.1" [build-dependencies] regex = "1.3.9" diff --git a/tests/src/utils.rs b/tests/src/utils.rs index f01d1c00..2eb5181a 100644 --- a/tests/src/utils.rs +++ b/tests/src/utils.rs @@ -49,7 +49,6 @@ pub fn render_document<F: FnOnce(&cairo::Context)>( #[cfg(system_deps_have_pangoft2)] mod pango_ft2 { use super::*; - use fontconfig_sys::fontconfig; use glib::prelude::*; use pangocairo::FontMap; @@ -59,7 +58,7 @@ mod pango_ft2 { // This is not bound in gtk-rs, and PangoFcFontMap is not even exposed, so we'll bind it by hand. fn pango_fc_font_map_set_config( font_map: *mut libc::c_void, - config: *mut fontconfig::FcConfig, + config: *mut fontconfig_sys::FcConfig, ); } @@ -73,15 +72,17 @@ mod pango_ft2 { "tests/resources/Roboto-BoldItalic.ttf", ]; - let config = fontconfig::FcConfigCreate(); - if fontconfig::FcConfigSetCurrent(config) == 0 { + let config = fontconfig_sys::FcConfigCreate(); + if fontconfig_sys::FcConfigSetCurrent(config) == 0 { panic!("Could not set a fontconfig configuration"); } for path in &font_paths { let path_cstring = CString::new(*path).unwrap(); - if fontconfig::FcConfigAppFontAddFile(config, path_cstring.as_ptr() as *const _) == 0 { + if fontconfig_sys::FcConfigAppFontAddFile(config, path_cstring.as_ptr() as *const _) + == 0 + { panic!("Could not load font file {} for tests; aborting", path,); } } @@ -90,7 +91,7 @@ mod pango_ft2 { let raw_font_map: *mut pango::ffi::PangoFontMap = font_map.to_glib_none().0; pango_fc_font_map_set_config(raw_font_map as *mut _, config); - fontconfig::FcConfigDestroy(config); + fontconfig_sys::FcConfigDestroy(config); FontMap::set_default(Some(&font_map.downcast::<pangocairo::FontMap>().unwrap())); } |