From adb75ba1142fbb05d002da65e97887fa2e39658c Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 10 Aug 2020 13:11:38 -0400
Subject: [PATCH] Revert "Revert "Update harfbuzz, freetype, unicode-script.""

This reverts commit 6b520850f34d55e88678999ff85aa70ba949d10c.
---
 Cargo.lock                        | 37 +++++++++----------------------
 components/gfx/Cargo.toml         |  6 ++---
 components/layout/Cargo.toml      |  2 +-
 components/layout_2020/Cargo.toml |  2 +-
 servo-tidy.toml                   |  1 -
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd14381b698..8b538a40dcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1007,18 +1007,6 @@ dependencies = [
  "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]]
 name = "core-text"
 version = "15.0.0"
@@ -1593,7 +1581,7 @@ dependencies = [
  "byteorder",
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
- "core-text 15.0.0",
+ "core-text",
  "dirs",
  "dwrote",
  "float-ord",
@@ -1884,12 +1872,12 @@ dependencies = [
  "byteorder",
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
- "core-text 15.0.0",
+ "core-text",
  "dwrote",
  "euclid",
  "fnv",
  "fontsan",
- "freetype 0.4.1",
+ "freetype 0.5.1",
  "gfx_traits",
  "harfbuzz-sys",
  "ipc-channel",
@@ -2504,15 +2492,15 @@ checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f"
 
 [[package]]
 name = "harfbuzz-sys"
-version = "0.3.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d74cab8498b2d15700b694fb38f77562869d05e1f8b602dd05221a1ca2d63"
+checksum = "8c50680ef38c3c83947499b5df4f340db5b436807dfa2b21330d86254e2e4dd6"
 dependencies = [
  "cc",
- "core-graphics 0.17.3",
- "core-text 13.3.2",
+ "core-graphics 0.19.0",
+ "core-text",
  "foreign-types",
- "freetype 0.4.1",
+ "freetype 0.5.1",
  "pkg-config",
 ]
 
@@ -6497,12 +6485,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-script"
-version = "0.3.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f03ad95feb4fde244d79985bfd79eb34ff2702fedb441d2ba3f4ff813efd19"
-dependencies = [
- "harfbuzz-sys",
-]
+checksum = "79bf4d5fc96546fdb73f9827097810bbda93b11a6770ff3a54e1f445d4135787"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6861,7 +6846,7 @@ dependencies = [
  "cfg-if",
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
- "core-text 15.0.0",
+ "core-text",
  "cstr",
  "dwrote",
  "euclid",
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index d8ba44dc612..e79575d5d07 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -20,7 +20,7 @@ euclid = "0.20"
 fnv = "1.0"
 fontsan = { git = "https://github.com/servo/fontsan" }
 gfx_traits = { path = "../gfx_traits" }
-harfbuzz-sys = "0.3"
+harfbuzz-sys = "0.4"
 ipc-channel = "0.14"
 lazy_static = "1"
 libc = "0.2"
@@ -37,7 +37,7 @@ style = { path = "../style", features = ["servo"] }
 time = "0.1.12"
 ucd = "0.1.1"
 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" }
 xi-unicode = "0.1.0"
 
@@ -48,7 +48,7 @@ core-graphics = "0.19"
 core-text = "15.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-freetype = "0.4"
+freetype = "0.5"
 servo_allocator = { path = "../allocator" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 90aaaa58011..a6bc544f9b3 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -48,7 +48,7 @@ smallvec = { version = "0.6", features = ["std", "union"] }
 style = { path = "../style", features = ["servo", "servo-layout-2013"] }
 style_traits = { path = "../style_traits" }
 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" }
 xi-unicode = "0.1.0"
 
diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
index 6ca3d709627..75a948fa56d 100644
--- a/components/layout_2020/Cargo.toml
+++ b/components/layout_2020/Cargo.toml
@@ -42,7 +42,7 @@ servo_arc = { path = "../servo_arc" }
 servo_url = { path = "../url" }
 style = { path = "../style", features = ["servo", "servo-layout-2020"] }
 style_traits = { path = "../style_traits" }
-unicode-script = { version = "0.3", features = ["harfbuzz"] }
+unicode-script = "0.5"
 webrender_api = { git = "https://github.com/servo/webrender" }
 
 [dev-dependencies]
diff --git a/servo-tidy.toml b/servo-tidy.toml
index e98cdbd5aa4..153f0e87847 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -64,7 +64,6 @@ packages = [
   "core-foundation",
   "core-foundation-sys",
   "core-graphics",
-  "core-text",
   "lyon_geom",
 
   # Duplicated by webrender debugger via ws