Revert "Revert "Update font-kit and freetype and unicode-script.""

This reverts commit 10ae3bfbbb.
This commit is contained in:
Josh Matthews 2020-08-10 13:11:50 -04:00
parent adb75ba114
commit 420e19f172
6 changed files with 220 additions and 27 deletions

67
Cargo.lock generated
View file

@ -995,6 +995,19 @@ dependencies = [
"libc",
]
[[package]]
name = "core-graphics"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"
dependencies = [
"bitflags",
"core-foundation 0.9.0",
"core-graphics-types",
"foreign-types",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.1.0"
@ -1019,6 +1032,18 @@ dependencies = [
"libc",
]
[[package]]
name = "core-text"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
dependencies = [
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"foreign-types",
"libc",
]
[[package]]
name = "cpuid-bool"
version = "0.1.2"
@ -1573,19 +1598,19 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "font-kit"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ed9b6d89600e22d9bfcfdd8c27e981540664a1a85a3f3971793c75502f49d9"
checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20"
dependencies = [
"bitflags",
"byteorder",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text",
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-text 19.0.0",
"dirs",
"dwrote",
"float-ord",
"freetype 0.5.1",
"freetype 0.7.0",
"lazy_static",
"libc",
"log",
@ -1633,9 +1658,9 @@ dependencies = [
[[package]]
name = "freetype"
version = "0.5.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b73222ab32d9ad65fe0e1c3258da8d614fd47cf19fce92b09eb520060c5c5ad5"
checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
dependencies = [
"freetype-sys",
"libc",
@ -1643,9 +1668,9 @@ dependencies = [
[[package]]
name = "freetype-sys"
version = "0.11.0"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d48ac0ce366dd47a115ec8e598d7c51b4a974fc52ded5e53a56b31f55f34f3ea"
checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
dependencies = [
"cmake",
"libc",
@ -1872,12 +1897,12 @@ dependencies = [
"byteorder",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text",
"core-text 15.0.0",
"dwrote",
"euclid",
"fnv",
"fontsan",
"freetype 0.5.1",
"freetype 0.7.0",
"gfx_traits",
"harfbuzz-sys",
"ipc-channel",
@ -2492,15 +2517,15 @@ checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f"
[[package]]
name = "harfbuzz-sys"
version = "0.4.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c50680ef38c3c83947499b5df4f340db5b436807dfa2b21330d86254e2e4dd6"
checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467"
dependencies = [
"cc",
"core-graphics 0.19.0",
"core-text",
"core-graphics 0.22.0",
"core-text 19.0.0",
"foreign-types",
"freetype 0.5.1",
"freetype 0.7.0",
"pkg-config",
]
@ -4574,7 +4599,7 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63"
[[package]]
name = "raqote"
version = "0.8.1-alpha.0"
source = "git+https://github.com/jrmuizel/raqote#5444a1040bd4fd72e860ff75244fbe8fa7814470"
source = "git+https://github.com/jdm/raqote?branch=fkup#ff5d2d1aa7813dbcacb0d028cf7d17c82a35d9d4"
dependencies = [
"euclid",
"font-kit",
@ -5146,9 +5171,9 @@ dependencies = [
[[package]]
name = "servo-fontconfig-sys"
version = "5.0.1"
version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c5e8d42c2957f6f433d90ab61277ed0226b3f49fffb19aa5493213c42e5d6df"
checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
dependencies = [
"expat-sys",
"freetype-sys",
@ -6846,7 +6871,7 @@ dependencies = [
"cfg-if",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text",
"core-text 15.0.0",
"cstr",
"dwrote",
"euclid",