From 734513c66810fe43ce55005343a1b8d400baaeab Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 17 Sep 2015 22:33:11 -0700 Subject: [PATCH] Update glutin to latest upstream merge To pick up servo/glutin#47. --- components/servo/Cargo.lock | 18 ++++-------------- ports/cef/Cargo.lock | 18 ++++-------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 4207962112d..04b1d3fd521 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -639,16 +639,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.0.27" @@ -672,8 +662,8 @@ dependencies = [ [[package]] name = "glutin" -version = "0.3.5" -source = "git+https://github.com/servo/glutin?branch=servo#1083121e586539760e2b1e9a99bbf3012e78fb98" +version = "0.3.6" +source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -683,7 +673,7 @@ dependencies = [ "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (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.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -711,7 +701,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 90c9e8e3e1e..e0835fd91d6 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -590,16 +590,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.0.27" @@ -623,8 +613,8 @@ dependencies = [ [[package]] name = "glutin" -version = "0.3.5" -source = "git+https://github.com/servo/glutin?branch=servo#1083121e586539760e2b1e9a99bbf3012e78fb98" +version = "0.3.6" +source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -634,7 +624,7 @@ dependencies = [ "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (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.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -662,7 +652,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1",