Auto merge of #18598 - glennw:update-wr-driver-bug, r=emilio

Update WR (work around a mac GL driver bug).

Also includes updates to the mac core-* crates and friends.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18598)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-24 16:13:47 -05:00 committed by GitHub
commit 61f0fc199e
8 changed files with 104 additions and 110 deletions

View file

@ -13,7 +13,7 @@ path = "lib.rs"
euclid = "0.15"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.4"
image = "0.12"
image = "0.14"
ipc-channel = "0.8"
log = "0.3.5"
msg = {path = "../msg"}

View file

@ -44,9 +44,9 @@ xi-unicode = "0.1.0"
[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.3"
core-graphics = "0.8"
core-text = "6.0"
core-foundation = "0.4"
core-graphics = "0.9"
core-text = "7.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.3"

View file

@ -15,7 +15,7 @@ heapsize = "0.4"
heapsize_derive = "0.1"
hyper = "0.10"
hyper_serde = "0.7"
image = "0.12"
image = "0.14"
ipc-channel = "0.8"
lazy_static = "0.2"
log = "0.3.5"

View file

@ -48,7 +48,7 @@ heapsize_derive = "0.1"
html5ever = {version = "0.19", features = ["heap_size"]}
hyper = "0.10"
hyper_serde = "0.7"
image = "0.12"
image = "0.14"
ipc-channel = "0.8"
js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]}
jstraceable_derive = {path = "../jstraceable_derive"}

View file

@ -14,7 +14,7 @@ base64 = "0.5.2"
cookie = "0.6"
euclid = "0.15"
hyper = "0.10"
image = "0.12"
image = "0.14"
ipc-channel = "0.8"
log = "0.3.5"
msg = {path = "../msg"}