From 91e2154a662c9871a04fe5a07da488cc8526d16a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 13 Jul 2021 19:04:52 +0200 Subject: [PATCH] Remove the freetype dependency on Windows and macOS It's not needed and this would fix #315 --- sixtyfps_runtime/rendering_backends/gl/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sixtyfps_runtime/rendering_backends/gl/Cargo.toml b/sixtyfps_runtime/rendering_backends/gl/Cargo.toml index 6c54fdb65..318112cb6 100644 --- a/sixtyfps_runtime/rendering_backends/gl/Cargo.toml +++ b/sixtyfps_runtime/rendering_backends/gl/Cargo.toml @@ -50,13 +50,15 @@ ttf-parser = "0.12.0" winit = { version = "0.25", default-features = false } glutin = { version = "0.27", default-features = false } glow = { version = "0.10.0", default-features = false } -font-kit = { version = "0.10", features = ["loader-freetype"] } +font-kit = { version = "0.10", features = [] } fontdb = { version = "0.5.1", features = ["fs"] } -# Require font-config from the system. Issue #88 indicates that the copy provided by servo-fontconfig may be incompatible -# with distros at times. [target.'cfg(not(any(target_family = "windows", target_os = "macos", target_os = "ios", target_arch = "wasm32")))'.dependencies] +# Require font-config from the system on Linux. Issue #88 indicates that the copy provided by servo-fontconfig may be incompatible +# with distros at times. servo-fontconfig = { version = "0.5", features = [ "force_system_lib" ] } +# On Windows and macOS we don't need freetype (font-kit has coretext/directwrite backends) +font-kit = { version = "0.10", features = ["loader-freetype"] } [target.'cfg(target_os = "macos")'.dependencies] cocoa = { version = "0.24.0" }