From 72fd95f613e208edea13bb5e1fce663d793a9eb1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 01:00:18 -0400 Subject: [PATCH] Update font-kit. --- Cargo.lock | 163 ++++++++++++++--------------------- components/canvas/Cargo.toml | 4 +- components/config/Cargo.toml | 2 +- components/config/basedir.rs | 6 +- components/gfx/Cargo.toml | 2 +- servo-tidy.toml | 1 + 6 files changed, 74 insertions(+), 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f46551ac529..2d1b8b5c640 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,12 +124,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30bbe2f5e3d117f55bd8c7a1f9191e4a5deba9f15f595bbea4f670c59c765db" -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - [[package]] name = "arrayvec" version = "0.4.12" @@ -346,17 +340,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec 0.5.1", - "constant_time_eq", -] - [[package]] name = "block" version = "0.1.6" @@ -903,18 +886,18 @@ dependencies = [ "webxr", ] +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + [[package]] name = "const_fn" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constellation" version = "0.0.1" @@ -1095,9 +1078,9 @@ dependencies = [ [[package]] name = "core-text" -version = "19.0.0" +version = "19.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" dependencies = [ "core-foundation 0.9.0", "core-graphics 0.22.0", @@ -1439,22 +1422,21 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "2.0.2" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] -name = "dirs-sys" -version = "0.3.4" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "cfg-if 0.1.10", "libc", "redox_users", "winapi", @@ -1652,16 +1634,6 @@ dependencies = [ "serde", ] -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1714,16 +1686,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-kit" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20" +checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" dependencies = [ "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", "core-text", - "dirs", + "dirs-next", "dwrote", "float-ord", "freetype", @@ -1732,9 +1704,18 @@ dependencies = [ "log", "pathfinder_geometry", "pathfinder_simd", - "servo-fontconfig", "walkdir", "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fontconfig" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25320ad784a9578ada0b395dd7dcd2321109404bbb341ec27e64b01a1e49b47" +dependencies = [ + "yeslogic-fontconfig-sys", ] [[package]] @@ -2013,6 +1994,7 @@ dependencies = [ "dwrote", "euclid", "fnv", + "fontconfig", "fontsan", "freetype", "gfx_traits", @@ -2025,7 +2007,6 @@ dependencies = [ "net_traits", "range", "serde", - "servo-fontconfig", "servo_allocator", "servo_arc", "servo_atoms", @@ -4329,9 +4310,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "opaque-debug" @@ -4452,7 +4433,7 @@ dependencies = [ "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", - "redox_syscall", + "redox_syscall 0.1.56", "smallvec 1.6.1", "winapi", ] @@ -4467,7 +4448,7 @@ dependencies = [ "cloudabi 0.1.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.56", "smallvec 1.6.1", "winapi", ] @@ -4913,7 +4894,7 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63" [[package]] name = "raqote" version = "0.8.1-alpha.0" -source = "git+https://github.com/jdm/raqote?branch=fkup#ff5d2d1aa7813dbcacb0d028cf7d17c82a35d9d4" +source = "git+https://github.com/jdm/raqote?branch=fkup#5a650714ea20f44ebe14de9fce60eeef100144c1" dependencies = [ "euclid", "font-kit", @@ -4974,24 +4955,33 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" dependencies = [ - "redox_syscall", + "redox_syscall 0.1.56", ] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.1.16", - "redox_syscall", - "rust-argon2", + "getrandom 0.2.6", + "redox_syscall 0.2.13", + "thiserror", ] [[package]] @@ -5054,18 +5044,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rust-argon2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" -dependencies = [ - "base64 0.12.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.7.2", -] - [[package]] name = "rustc-demangle" version = "0.1.18" @@ -5482,27 +5460,6 @@ dependencies = [ "libc", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47fef69c52fb55838c756949c60595f0b855daa4e82fc52ad99ff3e03e2c70" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "servo-gst-plugin" version = "0.0.1" @@ -5716,7 +5673,7 @@ dependencies = [ name = "servo_config" version = "0.0.1" dependencies = [ - "dirs", + "dirs-next", "embedder_traits", "euclid", "getopts", @@ -6316,7 +6273,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "rand", - "redox_syscall", + "redox_syscall 0.1.56", "remove_dir_all", "winapi", ] @@ -6349,7 +6306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.1.56", "redox_termios", ] @@ -6412,7 +6369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.1.56", "winapi", ] @@ -7482,6 +7439,18 @@ dependencies = [ "time", ] +[[package]] +name = "yeslogic-fontconfig-sys" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3f5a91c31bef6650d3a1b69192b4217fd88e4cfedc8101813e4dc3394ecbb8" +dependencies = [ + "const-cstr", + "dlib 0.5.0", + "once_cell", + "pkg-config", +] + [[package]] name = "zip" version = "0.3.3" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 04b5e1162ee..1d51ab6e7ea 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -22,7 +22,7 @@ canvas_traits = { path = "../canvas_traits" } crossbeam-channel = "0.4" cssparser = "0.29" euclid = "0.20" -font-kit = "0.10" +font-kit = "0.11" fnv = "1.0" gfx = { path = "../gfx" } gleam = "0.12" @@ -33,7 +33,7 @@ lyon_geom = "0.14" num-traits = "0.2" pathfinder_geometry = "0.5" pixels = { path = "../pixels" } -raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] } +raqote = { git = "https://github.com/jrmuizel/raqote" } servo_arc = { path = "../servo_arc" } servo_config = { path = "../config" } sparkle = "0.1.25" diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index 86ba7c00fde..831de6646f6 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -31,4 +31,4 @@ url = "2.0" std_test_override = { path = "../std_test_override" } [target.'cfg(not(target_os = "android"))'.dependencies] -dirs = "2.0.2" +dirs-next = "2.0" diff --git a/components/config/basedir.rs b/components/config/basedir.rs index af993e3852f..c587d82f769 100644 --- a/components/config/basedir.rs +++ b/components/config/basedir.rs @@ -15,7 +15,7 @@ use std::path::PathBuf; not(target_os = "android") ))] pub fn default_config_dir() -> Option { - let mut config_dir = ::dirs::config_dir().unwrap(); + let mut config_dir = ::dirs_next::config_dir().unwrap(); config_dir.push("servo"); config_dir.push("default"); Some(config_dir) @@ -30,14 +30,14 @@ pub fn default_config_dir() -> Option { pub fn default_config_dir() -> Option { // FIXME: use `config_dir()` ($HOME/Library/Preferences) // instead of `data_dir()` ($HOME/Library/Application Support) ? - let mut config_dir = ::dirs::data_dir().unwrap(); + let mut config_dir = ::dirs_next::data_dir().unwrap(); config_dir.push("Servo"); Some(config_dir) } #[cfg(all(target_os = "windows", not(feature = "uwp")))] pub fn default_config_dir() -> Option { - let mut config_dir = ::dirs::config_dir().unwrap(); + let mut config_dir = ::dirs_next::config_dir().unwrap(); config_dir.push("Servo"); Some(config_dir) } diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index df819aab86d..d6242a6dd85 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -52,7 +52,7 @@ freetype = "0.7" servo_allocator = { path = "../allocator" } [target.'cfg(target_os = "linux")'.dependencies] -servo-fontconfig = "0.5" +fontconfig = "0.5" [target.'cfg(target_os = "android")'.dependencies] xml-rs = "0.8" diff --git a/servo-tidy.toml b/servo-tidy.toml index dbf6509079c..4fc16ede4d8 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -49,6 +49,7 @@ packages = [ "parking_lot", "parking_lot_core", "petgraph", + "redox_syscall", "ron", "wasi", "wayland-sys",