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

Revert "Revert "Update harfbuzz, freetype, unicode-script.""

Browse source 
This reverts commit 6b520850f3.
This commit is contained in:
Josh Matthews 2020-08-10 13:11:38 -04:00
parent 64b26a73c5
commit adb75ba114
5 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Cargo.lock generated
View file

@ -1007,18 +1007,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "core-text"
version = "13.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db84654ad95211c082cf9795f6f83dc17d0ae6c985ac1b906369dc7384ed346d"
dependencies = [
"core-foundation 0.6.4",
"core-graphics 0.17.3",
"foreign-types",
"libc",
]
[[package]] [[package]]
name = "core-text" name = "core-text"
version = "15.0.0" version = "15.0.0"
@ -1593,7 +1581,7 @@ dependencies = [
"byteorder", "byteorder",
"core-foundation 0.7.0", "core-foundation 0.7.0",
"core-graphics 0.19.0", "core-graphics 0.19.0",
"core-text 15.0.0", "core-text",
"dirs", "dirs",
"dwrote", "dwrote",
"float-ord", "float-ord",
@ -1884,12 +1872,12 @@ dependencies = [
"byteorder", "byteorder",
"core-foundation 0.7.0", "core-foundation 0.7.0",
"core-graphics 0.19.0", "core-graphics 0.19.0",
"core-text 15.0.0", "core-text",
"dwrote", "dwrote",
"euclid", "euclid",
"fnv", "fnv",
"fontsan", "fontsan",
"freetype 0.4.1", "freetype 0.5.1",
"gfx_traits", "gfx_traits",
"harfbuzz-sys", "harfbuzz-sys",
"ipc-channel", "ipc-channel",
@ -2504,15 +2492,15 @@ checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f"
[[package]] [[package]]
name = "harfbuzz-sys" name = "harfbuzz-sys"
version = "0.3.4" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "212d74cab8498b2d15700b694fb38f77562869d05e1f8b602dd05221a1ca2d63" checksum = "8c50680ef38c3c83947499b5df4f340db5b436807dfa2b21330d86254e2e4dd6"
dependencies = [ dependencies = [
"cc", "cc",
"core-graphics 0.17.3", "core-graphics 0.19.0",
"core-text 13.3.2", "core-text",
"foreign-types", "foreign-types",
"freetype 0.4.1", "freetype 0.5.1",
"pkg-config", "pkg-config",
] ]
@ -6497,12 +6485,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-script" name = "unicode-script"
version = "0.3.0" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09f03ad95feb4fde244d79985bfd79eb34ff2702fedb441d2ba3f4ff813efd19" checksum = "79bf4d5fc96546fdb73f9827097810bbda93b11a6770ff3a54e1f445d4135787"
dependencies = [
"harfbuzz-sys",
]
[[package]] [[package]]
name = "unicode-segmentation" name = "unicode-segmentation"
@ -6861,7 +6846,7 @@ dependencies = [
"cfg-if", "cfg-if",
"core-foundation 0.7.0", "core-foundation 0.7.0",
"core-graphics 0.19.0", "core-graphics 0.19.0",
"core-text 15.0.0", "core-text",
"cstr", "cstr",
"dwrote", "dwrote",
"euclid", "euclid",

6
components/gfx/Cargo.toml
View file

@ -20,7 +20,7 @@ euclid = "0.20"
fnv = "1.0" fnv = "1.0"
fontsan = { git = "https://github.com/servo/fontsan" } fontsan = { git = "https://github.com/servo/fontsan" }
gfx_traits = { path = "../gfx_traits" } gfx_traits = { path = "../gfx_traits" }
harfbuzz-sys = "0.3" harfbuzz-sys = "0.4"
ipc-channel = "0.14" ipc-channel = "0.14"
lazy_static = "1" lazy_static = "1"
libc = "0.2" libc = "0.2"
@ -37,7 +37,7 @@ style = { path = "../style", features = ["servo"] }
time = "0.1.12" time = "0.1.12"
ucd = "0.1.1" ucd = "0.1.1"
unicode-bidi = { version = "0.3", features = ["with_serde"] } unicode-bidi = { version = "0.3", features = ["with_serde"] }
unicode-script = { version = "0.3", features = ["harfbuzz"] } unicode-script = "0.5"
webrender_api = { git = "https://github.com/servo/webrender" } webrender_api = { git = "https://github.com/servo/webrender" }
xi-unicode = "0.1.0" xi-unicode = "0.1.0"
@ -48,7 +48,7 @@ core-graphics = "0.19"
core-text = "15.0" core-text = "15.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.4" freetype = "0.5"
servo_allocator = { path = "../allocator" } servo_allocator = { path = "../allocator" }
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]

2
components/layout/Cargo.toml
View file

@ -48,7 +48,7 @@ smallvec = { version = "0.6", features = ["std", "union"] }
style = { path = "../style", features = ["servo", "servo-layout-2013"] } style = { path = "../style", features = ["servo", "servo-layout-2013"] }
style_traits = { path = "../style_traits" } style_traits = { path = "../style_traits" }
unicode-bidi = { version = "0.3", features = ["with_serde"] } unicode-bidi = { version = "0.3", features = ["with_serde"] }
unicode-script = { version = "0.3", features = ["harfbuzz"] } unicode-script = "0.5"
webrender_api = { git = "https://github.com/servo/webrender" } webrender_api = { git = "https://github.com/servo/webrender" }
xi-unicode = "0.1.0" xi-unicode = "0.1.0"

2
components/layout_2020/Cargo.toml
View file

@ -42,7 +42,7 @@ servo_arc = { path = "../servo_arc" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style = { path = "../style", features = ["servo", "servo-layout-2020"] } style = { path = "../style", features = ["servo", "servo-layout-2020"] }
style_traits = { path = "../style_traits" } style_traits = { path = "../style_traits" }
unicode-script = { version = "0.3", features = ["harfbuzz"] } unicode-script = "0.5"
webrender_api = { git = "https://github.com/servo/webrender" } webrender_api = { git = "https://github.com/servo/webrender" }
[dev-dependencies] [dev-dependencies]

1
servo-tidy.toml
View file

@ -64,7 +64,6 @@ packages = [
"core-foundation", "core-foundation",
"core-foundation-sys", "core-foundation-sys",
"core-graphics", "core-graphics",
"core-text",
"lyon_geom", "lyon_geom",
# Duplicated by webrender debugger via ws # Duplicated by webrender debugger via ws