From dab954a25392a3358830b9c8a6f53d7667b0115d Mon Sep 17 00:00:00 2001
From: Glenn Watson <gw@intuitionlibrary.com>
Date: Fri, 30 Jan 2015 08:12:19 +1000
Subject: [PATCH] Switch glutin to use servo fork, which contains a crash fix
 for XCloseDisplay in some X11 drivers.

---
 components/servo/Cargo.lock | 4 ++--
 ports/glutin/Cargo.toml     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 3488655cefa..66267664a09 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -365,7 +365,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.4-pre"
-source = "git+https://github.com/tomaka/glutin#1d6b863cd454839b8e3cf1e296cbf8f31fb70029"
+source = "git+https://github.com/servo/glutin?branch=servo#3814e0cadc85f558b7a417c9d4b97337382aeb36"
 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)",
@@ -386,7 +386,7 @@ 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/tomaka/glutin)",
+ "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "msg 0.0.1",
  "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index ccfdb761f76..45ead82ed02 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -27,7 +27,8 @@ path = "../../components/msg"
 path = "../../components/util"
 
 [dependencies.glutin]
-git = "https://github.com/tomaka/glutin"
+git = "https://github.com/servo/glutin"
+branch = "servo"
 
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"