auto merge of #5000 : Ms2ger/servo/libc-gfx, r=jdm

5 files changed, 28 insertions, 7 deletions

diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 0ae81eafeee..359bc97e841 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -68,3 +68,4 @@ url = "0.2.16"
 time = "0.1.12"
 bitflags = "*"
 rustc-serialize = "0.2"
+libc = "*"
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index fcb57c2f807..808f2027213 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -9,7 +9,6 @@
 #![feature(hash)]
 #![feature(int_uint)]
 #![cfg_attr(any(target_os="linux", target_os = "android"), feature(io))]
-#![feature(libc)]
 #![cfg_attr(any(target_os="linux", target_os = "android"), feature(path))]
 #![feature(plugin)]
 #![feature(rustc_private)]
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 51d3feaec20..76c6506d23a 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -260,7 +260,10 @@ dependencies = [
 [[package]]
 name = "freetype"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-freetype#f65e8d82550b5d5b06a7785a13a008e125c30b7a"
+source = "git+https://github.com/servo/rust-freetype#47ead45f939fe934af40e9652205c9d2a8b8e5e0"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "freetype-sys"
@@ -307,6 +310,7 @@ dependencies = [
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net 0.0.1",
  "plugins 0.0.1",
@@ -400,7 +404,10 @@ dependencies = [
 [[package]]
 name = "harfbuzz"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-harfbuzz#d5833511875673aa994ca194922acb3b1ea3ec61"
+source = "git+https://github.com/servo/rust-harfbuzz#d583ad55cc27600ffd33a8924812ec5ddb826c70"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "html5ever"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index dfc0019c122..51c6951a698 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -263,7 +263,10 @@ dependencies = [
 [[package]]
 name = "freetype"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-freetype#f65e8d82550b5d5b06a7785a13a008e125c30b7a"
+source = "git+https://github.com/servo/rust-freetype#47ead45f939fe934af40e9652205c9d2a8b8e5e0"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "freetype-sys"
@@ -310,6 +313,7 @@ dependencies = [
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net 0.0.1",
  "plugins 0.0.1",
@@ -403,7 +407,10 @@ dependencies = [
 [[package]]
 name = "harfbuzz"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-harfbuzz#d5833511875673aa994ca194922acb3b1ea3ec61"
+source = "git+https://github.com/servo/rust-harfbuzz#d583ad55cc27600ffd33a8924812ec5ddb826c70"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "html5ever"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 103dffa7fd3..096c357744e 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -233,7 +233,10 @@ dependencies = [
 [[package]]
 name = "freetype"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-freetype#f65e8d82550b5d5b06a7785a13a008e125c30b7a"
+source = "git+https://github.com/servo/rust-freetype#47ead45f939fe934af40e9652205c9d2a8b8e5e0"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "freetype-sys"
@@ -272,6 +275,7 @@ dependencies = [
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net 0.0.1",
  "plugins 0.0.1",
@@ -328,7 +332,10 @@ dependencies = [
 [[package]]
 name = "harfbuzz"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-harfbuzz#d5833511875673aa994ca194922acb3b1ea3ec61"
+source = "git+https://github.com/servo/rust-harfbuzz#d583ad55cc27600ffd33a8924812ec5ddb826c70"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "html5ever"