auto merge of #4946 : Manishearth/servo/glutin_up, r=gw

Also moves some of our deps away from rustc's libc and onto Crates libc.

Needs:

 - https://github.com/servo/rust-azure/pull/144
 - https://github.com/servo/rust-xlib/pull/35
 - https://github.com/servo/gleam/pull/14
 - https://github.com/servo/rust-layers/pull/151

8 files changed, 99 insertions, 65 deletions

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index fde35423a83..0ca03e61ea0 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -36,7 +36,7 @@ dependencies = [
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304"
+source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@@ -44,6 +44,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -74,9 +75,10 @@ dependencies = [
 [[package]]
 name = "cocoa"
 version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#7f976d95666fec0fd1382e305d534a5e73586a3d"
+source = "git+https://github.com/servo/rust-cocoa#fdc033e2edf9e6979d6cd15da1a904b81a448b57"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -314,12 +316,15 @@ dependencies = [
 
 [[package]]
 name = "gl_common"
-version = "0.0.3"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "gl_generator"
-version = "0.0.16"
+version = "0.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -330,27 +335,29 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b"
+source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7"
 dependencies = [
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "glutin"
-version = "0.0.4-pre"
-source = "git+https://github.com/servo/glutin?branch=servo#7d602af694bdb400944990846f91d1043e2a2bc8"
+version = "0.0.4"
+source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
  "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
  "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "user32-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -365,8 +372,9 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)",
+ "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)",
  "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",
  "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -377,8 +385,8 @@ name = "glx"
 version = "0.0.1"
 source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6"
 dependencies = [
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -458,7 +466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84"
+source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
@@ -468,6 +476,7 @@ dependencies = [
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -847,9 +856,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "xlib"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9"
+source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index b16590eac5e..c6b9c00bb42 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -15,6 +15,7 @@ dependencies = [
  "glutin_app 0.0.1",
  "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
  "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",
@@ -38,7 +39,7 @@ dependencies = [
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304"
+source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@@ -46,6 +47,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -76,9 +78,10 @@ dependencies = [
 [[package]]
 name = "cocoa"
 version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#7f976d95666fec0fd1382e305d534a5e73586a3d"
+source = "git+https://github.com/servo/rust-cocoa#fdc033e2edf9e6979d6cd15da1a904b81a448b57"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -316,15 +319,18 @@ dependencies = [
 
 [[package]]
 name = "gl_common"
-version = "0.0.3"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "gl_generator"
-version = "0.0.16"
+version = "0.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "khronos_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -332,27 +338,29 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b"
+source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7"
 dependencies = [
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "glutin"
-version = "0.0.4-pre"
-source = "git+https://github.com/servo/glutin?branch=servo#7d602af694bdb400944990846f91d1043e2a2bc8"
+version = "0.0.4"
+source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
  "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
  "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "user32-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -367,8 +375,9 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)",
+ "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)",
  "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",
  "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -379,8 +388,8 @@ name = "glx"
 version = "0.0.1"
 source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6"
 dependencies = [
- "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -454,13 +463,18 @@ dependencies = [
 
 [[package]]
 name = "khronos_api"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "khronos_api"
 version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84"
+source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
@@ -470,6 +484,7 @@ dependencies = [
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -868,9 +883,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "xlib"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9"
+source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index 5ecacc4e5dd..2399c8c7088 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -75,4 +75,5 @@ git = "https://github.com/servo/gleam"
 git = "https://github.com/servo/rust-cgl"
 
 [dependencies]
-url = "*"
\ No newline at end of file
+url = "*"
+libc = "*"
\ No newline at end of file
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 87c092e86e5..d58ed4a32bd 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -42,3 +42,4 @@ git = "https://github.com/servo/rust-egl"
 [dependencies]
 time = "0.1.12"
 bitflags = "*"
+libc = "*"
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index cb30d1c4fa5..b644483adb2 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -8,7 +8,6 @@
 #![feature(core)]
 #![cfg_attr(feature = "window", feature(hash))]
 #![feature(box_syntax)]
-#![feature(libc)]
 
 #[macro_use] extern crate bitflags;
 #[cfg(target_os="macos")]
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 01800adb6df..7fcaefeacad 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -175,8 +175,8 @@ impl Window {
                 self.event_queue.borrow_mut().push(WindowEvent::Resize(TypedSize2D(width, height)));
             }
             Event::MouseInput(element_state, mouse_button) => {
-                if mouse_button == MouseButton::LeftMouseButton ||
-                                    mouse_button == MouseButton::RightMouseButton {
+                if mouse_button == MouseButton::Left ||
+                                    mouse_button == MouseButton::Right {
                         let mouse_pos = self.mouse_pos.get();
                         self.handle_mouse(mouse_button, element_state, mouse_pos.x, mouse_pos.y);
                    }
@@ -371,27 +371,27 @@ impl Window {
             VirtualKeyCode::Y => Ok(Key::Y),
             VirtualKeyCode::Z => Ok(Key::Z),
 
-            VirtualKeyCode::Numpad0 => Ok(Key::Num0),
-            VirtualKeyCode::Numpad1 => Ok(Key::Num1),
-            VirtualKeyCode::Numpad2 => Ok(Key::Num2),
-            VirtualKeyCode::Numpad3 => Ok(Key::Num3),
-            VirtualKeyCode::Numpad4 => Ok(Key::Num4),
-            VirtualKeyCode::Numpad5 => Ok(Key::Num5),
-            VirtualKeyCode::Numpad6 => Ok(Key::Num6),
-            VirtualKeyCode::Numpad7 => Ok(Key::Num7),
-            VirtualKeyCode::Numpad8 => Ok(Key::Num8),
-            VirtualKeyCode::Numpad9 => Ok(Key::Num9),
-
-            VirtualKeyCode::Key0 => Ok(Key::Kp0),
-            VirtualKeyCode::Key1 => Ok(Key::Kp1),
-            VirtualKeyCode::Key2 => Ok(Key::Kp2),
-            VirtualKeyCode::Key3 => Ok(Key::Kp3),
-            VirtualKeyCode::Key4 => Ok(Key::Kp4),
-            VirtualKeyCode::Key5 => Ok(Key::Kp5),
-            VirtualKeyCode::Key6 => Ok(Key::Kp6),
-            VirtualKeyCode::Key7 => Ok(Key::Kp7),
-            VirtualKeyCode::Key8 => Ok(Key::Kp8),
-            VirtualKeyCode::Key9 => Ok(Key::Kp9),
+            VirtualKeyCode::Numpad0 => Ok(Key::Kp0),
+            VirtualKeyCode::Numpad1 => Ok(Key::Kp1),
+            VirtualKeyCode::Numpad2 => Ok(Key::Kp2),
+            VirtualKeyCode::Numpad3 => Ok(Key::Kp3),
+            VirtualKeyCode::Numpad4 => Ok(Key::Kp4),
+            VirtualKeyCode::Numpad5 => Ok(Key::Kp5),
+            VirtualKeyCode::Numpad6 => Ok(Key::Kp6),
+            VirtualKeyCode::Numpad7 => Ok(Key::Kp7),
+            VirtualKeyCode::Numpad8 => Ok(Key::Kp8),
+            VirtualKeyCode::Numpad9 => Ok(Key::Kp9),
+
+            VirtualKeyCode::Key0 => Ok(Key::Num0),
+            VirtualKeyCode::Key1 => Ok(Key::Num1),
+            VirtualKeyCode::Key2 => Ok(Key::Num2),
+            VirtualKeyCode::Key3 => Ok(Key::Num3),
+            VirtualKeyCode::Key4 => Ok(Key::Num4),
+            VirtualKeyCode::Key5 => Ok(Key::Num5),
+            VirtualKeyCode::Key6 => Ok(Key::Num6),
+            VirtualKeyCode::Key7 => Ok(Key::Num7),
+            VirtualKeyCode::Key8 => Ok(Key::Num8),
+            VirtualKeyCode::Key9 => Ok(Key::Num9),
 
             VirtualKeyCode::Return => Ok(Key::Enter),
             VirtualKeyCode::Space => Ok(Key::Space),
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index ada1b63f89f..9926452e4e0 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -8,6 +8,7 @@ dependencies = [
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "layout 0.0.1",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "script 0.0.1",
  "servo 0.0.1",
@@ -17,7 +18,7 @@ dependencies = [
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304"
+source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@@ -25,6 +26,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -282,7 +284,7 @@ dependencies = [
 
 [[package]]
 name = "gl_generator"
-version = "0.0.16"
+version = "0.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -293,11 +295,12 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b"
+source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7"
 dependencies = [
  "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -306,7 +309,7 @@ version = "0.0.1"
 source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6"
 dependencies = [
  "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -378,7 +381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84"
+source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
@@ -388,6 +391,7 @@ dependencies = [
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)",
  "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
 ]
@@ -772,9 +776,10 @@ dependencies = [
 [[package]]
 name = "xlib"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9"
+source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml
index f78f4cfbd25..574eab7c26f 100644
--- a/ports/gonk/Cargo.toml
+++ b/ports/gonk/Cargo.toml
@@ -36,3 +36,5 @@ path = "../../components/util"
 [dependencies.egl]
 git = "https://github.com/servo/rust-egl"
 
+[dependencies]
+libc = "*"