Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update font-kit.

Browse source
This commit is contained in:
Josh Matthews 2022-04-01 01:00:18 -04:00
parent e57b9a3446
commit 72fd95f613
6 changed files with 74 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/canvas/Cargo.toml
View file

@ -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"

2
components/config/Cargo.toml
View file

@ -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"

6
components/config/basedir.rs
View file

@ -15,7 +15,7 @@ use std::path::PathBuf;
not(target_os = "android")
))]
pub fn default_config_dir() -> Option<PathBuf> {
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<PathBuf> {
pub fn default_config_dir() -> Option<PathBuf> {
// 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<PathBuf> {
let mut config_dir = ::dirs::config_dir().unwrap();
let mut config_dir = ::dirs_next::config_dir().unwrap();
config_dir.push("Servo");
Some(config_dir)
}

2
components/gfx/Cargo.toml
View file

@ -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"