Revert "Update raqote, font-kit, fontconfig."

This reverts commit a6ca582a55.

Cargo.lock

@@ -718,9 +718,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.44"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb"
+checksum = "3c84c596dcf125d6781f58e3f4254677ec2a6d8aa56e8501ac277100990b3229"
 dependencies = [
  "cc",
 ]
@@ -1211,6 +1211,16 @@ dependencies = [
  "ws",
 ]
 
+[[package]]
+name = "deflate"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
+dependencies = [
+ "adler32",
+ "byteorder",
+]
+
 [[package]]
 name = "deflate"
 version = "0.8.6"
@@ -1571,9 +1581,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "font-kit"
-version = "0.9.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ed9b6d89600e22d9bfcfdd8c27e981540664a1a85a3f3971793c75502f49d9"
+checksum = "76ab2cdc792b545c49acb23aafa1cdc9381ea96140741f10bac596fd1bd1aa4f"
 dependencies = [
  "bitflags",
  "byteorder",
@@ -1583,7 +1593,7 @@ dependencies = [
  "dirs",
  "dwrote",
  "float-ord",
- "freetype 0.5.1",
+ "freetype",
  "lazy_static",
  "libc",
  "log",
@@ -1629,27 +1639,6 @@ dependencies = [
  "servo-freetype-sys",
 ]
 
-[[package]]
-name = "freetype"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73222ab32d9ad65fe0e1c3258da8d614fd47cf19fce92b09eb520060c5c5ad5"
-dependencies = [
- "freetype-sys",
- "libc",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48ac0ce366dd47a115ec8e598d7c51b4a974fc52ded5e53a56b31f55f34f3ea"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "fs_extra"
 version = "1.1.0"
@@ -1865,7 +1854,7 @@ dependencies = [
  "euclid",
  "fnv",
  "fontsan",
- "freetype 0.4.1",
+ "freetype",
  "gfx_traits",
  "harfbuzz-sys",
  "ipc-channel",
@@ -2488,7 +2477,7 @@ dependencies = [
  "core-graphics 0.17.3",
  "core-text 13.3.2",
  "foreign-types",
- "freetype 0.4.1",
+ "freetype",
  "pkg-config",
 ]
 
@@ -2731,7 +2720,7 @@ dependencies = [
  "num-iter",
  "num-rational 0.3.0",
  "num-traits",
- "png",
+ "png 0.16.6",
  "scoped_threadpool",
  "tiff",
 ]
@@ -2757,6 +2746,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "inflate"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
+dependencies = [
+ "adler32",
+]
+
 [[package]]
 name = "input_buffer"
 version = "0.3.1"
@@ -4338,6 +4336,18 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "png"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "deflate 0.7.20",
+ "inflate",
+]
+
 [[package]]
 name = "png"
 version = "0.16.6"
@@ -4346,7 +4356,7 @@ checksum = "c150bf7479fafe3dd8740dbe48cc33b2a3efb7b0fe3483aced8bbc39f6d0238d"
 dependencies = [
  "bitflags",
  "crc32fast",
- "deflate",
+ "deflate 0.8.6",
  "miniz_oxide",
 ]
 
@@ -4556,14 +4566,15 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63"
 
 [[package]]
 name = "raqote"
-version = "0.8.1-alpha.0"
+version = "0.8.0"
-source = "git+https://github.com/jrmuizel/raqote#5444a1040bd4fd72e860ff75244fbe8fa7814470"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501c19caa439857ed7bea975fa4c3c10ee9a24e33c2640030c3ac14b58f39f77"
 dependencies = [
  "euclid",
  "font-kit",
  "lyon_geom 0.15.0",
  "pathfinder_geometry",
- "png",
+ "png 0.15.3",
  "sw-composite",
  "typed-arena",
 ]
@@ -5119,9 +5130,9 @@ dependencies = [
 
 [[package]]
 name = "servo-fontconfig"
-version = "0.5.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b47fef69c52fb55838c756949c60595f0b855daa4e82fc52ad99ff3e03e2c70"
+checksum = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9"
 dependencies = [
  "libc",
  "servo-fontconfig-sys",
@@ -5129,20 +5140,20 @@ dependencies = [
 
 [[package]]
 name = "servo-fontconfig-sys"
-version = "5.0.1"
+version = "4.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c5e8d42c2957f6f433d90ab61277ed0226b3f49fffb19aa5493213c42e5d6df"
+checksum = "62b3e166450f523f4db06c14f02a2d39e76d49b5d8cbd224338d93e3595c156c"
 dependencies = [
  "expat-sys",
- "freetype-sys",
  "pkg-config",
+ "servo-freetype-sys",
 ]
 
 [[package]]
 name = "servo-freetype-sys"
-version = "4.0.3"
+version = "4.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b"
+checksum = "2c4ccb6d0d32d277d3ef7dea86203d8210945eb7a45fba89dd445b3595dd0dfc"
 dependencies = [
  "cmake",
  "pkg-config",
@@ -6823,7 +6834,7 @@ dependencies = [
  "cstr",
  "dwrote",
  "euclid",
- "freetype 0.4.1",
+ "freetype",
  "fxhash",
  "gleam 0.11.0",
  "glslopt",

components/canvas/Cargo.toml

@@ -22,7 +22,7 @@ canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
 cssparser = "0.27"
 euclid = "0.20"
-font-kit = "0.9"
+font-kit = "0.7"
 fnv = "1.0"
 gfx = { path = "../gfx" }
 gleam = "0.11"
@@ -32,7 +32,7 @@ log = "0.4"
 lyon_geom = "0.14"
 num-traits = "0.2"
 pixels = { path = "../pixels" }
-raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] }
+raqote = { version = "0.8", features = ["text"] }
 servo_arc = { path = "../servo_arc" }
 servo_config = { path = "../config" }
 sparkle = "0.1.25"

components/gfx/Cargo.toml

@@ -52,7 +52,7 @@ freetype = "0.4"
 servo_allocator = { path = "../allocator" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-servo-fontconfig = "0.5"
+servo-fontconfig = "0.4"
 
 [target.'cfg(target_os = "android")'.dependencies]
 xml-rs = "0.8"

servo-tidy.toml

@@ -32,12 +32,10 @@ packages = [
   "arrayvec",
   "base64",
   "cocoa",
-  "freetype",
   "gleam",
   "libloading",
   "metal",
   "miniz_oxide",
-  "num-rational",
   "parking_lot",
   "parking_lot_core",
   "wayland-sys",