mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Migrate to yeslogic's fontconfig bindings.
This commit is contained in:
parent
f8a44d0ad4
commit
f4271e9f3f
3 changed files with 8 additions and 17 deletions
11
Cargo.lock
generated
11
Cargo.lock
generated
|
@ -1740,15 +1740,6 @@ dependencies = [
|
|||
"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]]
|
||||
name = "fontsan"
|
||||
version = "0.4.0"
|
||||
|
@ -2014,7 +2005,6 @@ dependencies = [
|
|||
"dwrote",
|
||||
"euclid",
|
||||
"fnv",
|
||||
"fontconfig",
|
||||
"fontsan",
|
||||
"freetype",
|
||||
"gfx_traits",
|
||||
|
@ -2041,6 +2031,7 @@ dependencies = [
|
|||
"webrender_api",
|
||||
"xi-unicode",
|
||||
"xml-rs",
|
||||
"yeslogic-fontconfig-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
@ -52,7 +52,7 @@ freetype = "0.7"
|
|||
servo_allocator = { path = "../allocator" }
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
fontconfig = "0.5"
|
||||
fontconfig_sys = { package = "yeslogic-fontconfig-sys", version = "3" }
|
||||
|
||||
[target.'cfg(target_os = "android")'.dependencies]
|
||||
xml-rs = "0.8"
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
use super::c_str_to_string;
|
||||
use crate::text::util::is_cjk;
|
||||
use fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem};
|
||||
use fontconfig::fontconfig::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute};
|
||||
use fontconfig::fontconfig::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString};
|
||||
use fontconfig::fontconfig::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy};
|
||||
use fontconfig::fontconfig::{
|
||||
use fontconfig_sys::{FcChar8, FcResultMatch, FcSetSystem};
|
||||
use fontconfig_sys::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute};
|
||||
use fontconfig_sys::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString};
|
||||
use fontconfig_sys::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy};
|
||||
use fontconfig_sys::{
|
||||
FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString,
|
||||
};
|
||||
use fontconfig::fontconfig::{FcObjectSetAdd, FcPatternGetInteger};
|
||||
use fontconfig_sys::{FcObjectSetAdd, FcPatternGetInteger};
|
||||
use libc::{c_char, c_int};
|
||||
use std::ffi::CString;
|
||||
use std::ptr;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue