aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-24 09:59:41 -0500
committerGitHub <noreply@github.com>2016-10-24 09:59:41 -0500
commitf90b256472ef7ad9a730bafbe64fc5dba83bdcdf (patch)
tree2dc51a519d62b07e9f769a98cdcbe063ab1e601e /components
parentca9d24d87e82ee05c2edf848205dcf94a04096f0 (diff)
parentaa4a20fc34b5b39662a53b664f5f98bd4f7884a3 (diff)
downloadservo-f90b256472ef7ad9a730bafbe64fc5dba83bdcdf.tar.gz
servo-f90b256472ef7ad9a730bafbe64fc5dba83bdcdf.zip
Auto merge of #13907 - mmatyas:update_libfontconfig, r=Ms2ger
Update libfontconfig to 4.0.2 <!-- Please describe your changes on the following line: --> Update libfontconfig to 4.0.2 to pick up servo/libfontconfig#26 and servo/libfontconfig#27. (This is a fix for servo/servo#13154) <!-- 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/13907) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/servo/Cargo.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 62900b91c64..8a41e47c823 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -2133,12 +2133,12 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-fontconfig-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "servo-fontconfig-sys"
-version = "4.0.1"
+version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2198,7 +2198,7 @@ dependencies = [
"io-surface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-fontconfig-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-glutin 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2959,7 +2959,7 @@ dependencies = [
"checksum serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e10f8a9d94b06cf5d3bef66475f04c8ff90950f1be7004c357ff9472ccbaebc"
"checksum servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217"
"checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262"
-"checksum servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e597efa2e1e0883fcb5317e0062d2ffdfed9b926ce8a6f90082be774f39e416"
+"checksum servo-fontconfig-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a0af4a4d7746467921486e5c5420f815cc016a6bf5574210d8e9c00f4afae224"
"checksum servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5daf749c5a8fe5e7f93fc5a355a2ea0b36502832c6feff79a67d9359baddde78"
"checksum servo-glutin 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc7cae7df54ab2c3b9f8cab92b2de395bd8033a3380521d2d23c340e24cc779"
"checksum servo-skia 0.20130412.24 (registry+https://github.com/rust-lang/crates.io-index)" = "bb975cdf292243956e6b6acfac336ac8be0aa567e32bb89901be161e4003d0b3"