Auto merge of #6412 - metajack:cleanup-dupe-gleam, r=glennw

Remove duplicate package



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6412)
<!-- Reviewable:end -->

ports/cef/Cargo.lock

@@ -3,7 +3,7 @@ name = "embedding"
 version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "compositing 0.0.1",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -12,7 +12,7 @@ dependencies = [
  "devtools 0.0.1",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gfx 0.0.1",
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
+ "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -99,15 +99,6 @@ dependencies = [
  "offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 ]
 
-[[package]]
-name = "cgl"
-version = "0.0.1"
-source = "git+https://github.com/servo/cgl-rs#ee2ba57c0cc576d13eb7b9413a3981291410d3b8"
-dependencies = [
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cgl"
 version = "0.1.0"
@@ -431,7 +422,7 @@ dependencies = [
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -463,17 +454,6 @@ dependencies = [
  "xml-rs 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "gleam"
-version = "0.0.1"
-source = "git+https://github.com/servo/gleam#0108e2a6c7ca4dc471bfb94ba1ed368335e4da28"
-dependencies = [
- "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)",
- "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "gleam"
 version = "0.1.0"
@@ -682,8 +662,8 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1053,8 +1033,8 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1149,19 +1129,6 @@ dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-dependencies = [
- "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)",
-]
-
 [[package]]
 name = "string_cache"
 version = "0.1.3"
@@ -1175,16 +1142,6 @@ dependencies = [
  "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache_plugin"
-version = "0.1.1"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-dependencies = [
- "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)",
-]
-
 [[package]]
 name = "string_cache_plugin"
 version = "0.1.2"
@@ -1195,11 +1152,6 @@ dependencies = [
  "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache_shared"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-
 [[package]]
 name = "string_cache_shared"
 version = "0.1.2"
@@ -1222,8 +1174,8 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -1310,8 +1262,8 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

ports/cef/Cargo.toml

@@ -12,6 +12,7 @@ crate-type = ["dylib"]
 log = "*"
 url = "*"
 libc = "*"
+gleam = "0.1"
 
 [dependencies.servo]
 path = "../../components/servo"
@@ -67,21 +68,16 @@ git = "https://github.com/servo/rust-png"
 [dependencies.stb_image]
 git = "https://github.com/servo/rust-stb-image"
 
-[dependencies.gleam]
-git = "https://github.com/servo/gleam"
-
 [target.x86_64-apple-darwin.dependencies]
 objc = "0.1"
-cocoa = "*"
+cocoa = "0.1"
-core-foundation = "*"
+core-foundation = "0.1"
-core-graphics = "*"
+core-graphics = "0.1"
+cgl = "0.1"
 
 [target.x86_64-apple-darwin.dependencies.core-text]
 git = "https://github.com/servo/core-text-rs"
 
-[target.x86_64-apple-darwin.dependencies.cgl]
-git = "https://github.com/servo/cgl-rs"
-
 [target.i686-unknown-linux-gnu.dependencies]
 x11 = "*"
 

ports/gonk/Cargo.lock

@@ -401,7 +401,7 @@ dependencies = [
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -607,8 +607,8 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -952,8 +952,8 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1038,19 +1038,6 @@ dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-dependencies = [
- "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)",
-]
-
 [[package]]
 name = "string_cache"
 version = "0.1.3"
@@ -1064,16 +1051,6 @@ dependencies = [
  "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache_plugin"
-version = "0.1.1"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-dependencies = [
- "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)",
-]
-
 [[package]]
 name = "string_cache_plugin"
 version = "0.1.2"
@@ -1084,11 +1061,6 @@ dependencies = [
  "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "string_cache_shared"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
-
 [[package]]
 name = "string_cache_shared"
 version = "0.1.2"
@@ -1111,8 +1083,8 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -1190,8 +1162,8 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]