aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/compositing/Cargo.toml14
-rw-r--r--components/gfx/Cargo.toml40
-rw-r--r--components/msg/Cargo.toml15
-rw-r--r--components/servo/Cargo.lock192
-rw-r--r--ports/cef/Cargo.lock196
-rw-r--r--ports/cef/Cargo.toml34
-rw-r--r--ports/glutin/Cargo.toml25
-rw-r--r--ports/glutin/lib.rs5
-rw-r--r--ports/gonk/Cargo.lock145
9 files changed, 303 insertions, 363 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 7c244dd3334..fe26cb0b1d0 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -52,17 +52,11 @@ git = "https://github.com/servo/rust-layers"
[dependencies.png]
git = "https://github.com/servo/rust-png"
-[dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
-
-[dependencies.core_text]
-git = "https://github.com/servo/rust-core-text"
-
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[dependencies.clipboard]
-git = "https://github.com/servo/rust-x11-clipboard"
+git = "https://github.com/aweinstock314/rust-clipboard"
[dependencies]
log = "*"
@@ -70,3 +64,9 @@ num = "0.1.24"
url = "0.2.35"
time = "0.1.17"
libc = "*"
+
+[target.x86_64-apple-darwin.dependencies]
+core-graphics = "*"
+
+[target.x86_64-apple-darwin.dependencies.core-text]
+git = "https://github.com/servo/core-text-rs"
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 882ed57833d..4d393342f0b 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -47,21 +47,6 @@ git = "https://github.com/servo/rust-stb-image"
[dependencies.png]
git = "https://github.com/servo/rust-png"
-[dependencies.fontconfig]
-git = "https://github.com/servo/rust-fontconfig"
-
-[dependencies.freetype]
-git = "https://github.com/servo/rust-freetype"
-
-[dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
-
-[dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
-
-[dependencies.core_text]
-git = "https://github.com/servo/rust-core-text"
-
[dependencies.skia]
git = "https://github.com/servo/skia"
@@ -80,3 +65,28 @@ rustc-serialize = "0.3"
libc = "*"
rand = "*"
harfbuzz = "0.1"
+
+[target.x86_64-apple-darwin.dependencies]
+core-foundation = "*"
+core-graphics = "*"
+
+[target.i686-unknown-linux-gnu.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.x86_64-unknown-linux-gnu.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.arm-linux-androideabi.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.i686-unknown-linux-gnu.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.x86_64-unknown-linux-gnu.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.arm-linux-androideabi.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.x86_64-apple-darwin.dependencies.core-text]
+git = "https://github.com/servo/core-text-rs"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index ac3e948a794..395c569913f 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -22,12 +22,6 @@ git = "https://github.com/servo/rust-geom"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
-[dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
-
-[dependencies.io_surface]
-git = "https://github.com/servo/rust-io-surface"
-
[dependencies.png]
git = "https://github.com/servo/rust-png"
@@ -35,4 +29,11 @@ git = "https://github.com/servo/rust-png"
url = "0.2.35"
bitflags = "*"
hyper = "0.5"
-rustc-serialize = "0.3.4" \ No newline at end of file
+rustc-serialize = "0.3.4"
+
+[target.x86_64-apple-darwin.dependencies]
+core-foundation = "*"
+
+[target.x86_64-apple-darwin.dependencies.io-surface]
+git = "https://github.com/servo/io-surface-rs"
+
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 6d31250f637..91e7615df26 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
"script 0.0.1",
"script_tests 0.0.1",
"style_tests 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
"util_tests 0.0.1",
@@ -42,11 +42,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#5b9f2dbe7517196a82ea3c9c4dc4cf9fbd7d0867"
+source = "git+https://github.com/servo/rust-azure#8ca7e25d5c2c6f66c63b803d24d3bbef13fa9f79"
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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -83,7 +83,7 @@ dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1",
]
@@ -103,7 +103,7 @@ dependencies = [
[[package]]
name = "cgl"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-cgl#851ca1b90081d221c3c38d33548d3e22a19db79f"
+source = "git+https://github.com/servo/cgl-rs#983d3ac5d7e0d9d3509fb502ebe1570dd885e404"
dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -112,10 +112,10 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-x11-clipboard#43afb218871e3148758c603f335576cb101cb1fa"
+source = "git+https://github.com/aweinstock314/rust-clipboard#5ed13c573ce1750a7c71570d03906e9c82962410"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -127,13 +127,23 @@ dependencies = [
]
[[package]]
+name = "cocoa"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "compositing"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "clipboard 0.0.1 (git+https://github.com/servo/rust-x11-clipboard)",
- "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "clipboard 0.0.1 (git+https://github.com/aweinstock314/rust-clipboard)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
@@ -146,12 +156,12 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"profile_traits 0.0.1",
"script_traits 0.0.1",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -163,34 +173,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
]
[[package]]
-name = "core_foundation"
+name = "core-foundation"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-foundation#c8236c28599b07894fa7d6887db2fa91bc7fda24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_graphics"
+name = "core-graphics"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-graphics#2d8d665c5bdd116b4a1addbe5c415735fb78e1a9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_text"
+name = "core-text"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-text#2b4b546718310a9d3fe4273a1df092c79d9fb2c2"
+source = "git+https://github.com/servo/core-text-rs#54080aaa67758917b2f974d8ebebc174ad570f56"
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)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -217,7 +227,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -230,7 +240,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -361,7 +371,7 @@ source = "git+https://github.com/servo/libfreetype2#86730043889cb17694bb65d7355d
[[package]]
name = "gcc"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -378,7 +388,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-geom#270d0246b79fbf86fc2938c4952cae74e4025fcf"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -390,9 +400,9 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
- "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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -413,7 +423,7 @@ dependencies = [
"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)",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -464,15 +474,15 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.26"
-source = "git+https://github.com/servo/glutin?branch=servo#3946d1767654c236d1954d81925a4e306e38cf96"
+source = "git+https://github.com/servo/glutin?branch=servo#3d39d1bb45a6f76be846ed92f946424e24109141"
dependencies = [
"android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.1.0 (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)",
- "glutin_cocoa 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_core_foundation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_core_graphics 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -489,7 +499,7 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -500,40 +510,13 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"script_traits 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
"x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "glutin_cocoa"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "glutin_core_foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "glutin_core_graphics"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glutin_core_foundation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "glx"
version = "0.0.1"
source = "git+https://github.com/servo/rust-glx#60ac0aee2438eadb4b51ddc8eac6fc4b5ca8e447"
@@ -564,7 +547,7 @@ dependencies = [
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -593,20 +576,20 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "io_surface"
+name = "io-surface"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
+source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -639,16 +622,16 @@ 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#842038559a402b37fc8bf4134a4d1329b0607739"
+source = "git+https://github.com/servo/rust-layers#36d02af1bf0d37894fdb77ab3c1860a6e7b554ae"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -765,7 +748,7 @@ name = "miniz-sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -780,10 +763,10 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -808,7 +791,7 @@ dependencies = [
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -842,7 +825,7 @@ dependencies = [
[[package]]
name = "num"
-version = "0.1.24"
+version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -869,10 +852,10 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#13c9f786c55266fa1594cb520fdbc74f45fda809"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#705d8647a48c37b43bc3746e7d0ecd2dfaa70519"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
@@ -898,7 +881,7 @@ name = "openssl-sys"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -970,7 +953,7 @@ name = "png"
version = "0.1.0"
source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
]
@@ -989,7 +972,7 @@ dependencies = [
"profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -997,7 +980,7 @@ dependencies = [
name = "profile_traits"
version = "0.0.1"
dependencies = [
- "time 0.1.25 (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)",
]
@@ -1019,12 +1002,12 @@ name = "regex"
version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "regex-syntax 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1059,7 +1042,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -1070,7 +1053,7 @@ dependencies = [
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1125,7 +1108,7 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#1b0a8f5b3805f510cb155476c5f245ef7a16ca54"
+source = "git+https://github.com/servo/skia#be64840752fdbd0b87e02ac99a92727a8454a2dc"
dependencies = [
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -1183,7 +1166,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
@@ -1211,7 +1194,7 @@ dependencies = [
name = "task_info"
version = "0.0.1"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1229,10 +1212,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1243,7 +1226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "typeable"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1283,7 +1266,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1292,7 +1275,7 @@ dependencies = [
"smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (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)",
]
@@ -1378,15 +1361,6 @@ dependencies = [
]
[[package]]
-name = "xlib"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#184533f276bfad3c78bf06e35ec68f09c18b89c4"
-dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 5cebe050cbc..95ea099ccfb 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -3,12 +3,12 @@ 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/rust-cgl)",
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
- "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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
@@ -41,11 +41,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#5b9f2dbe7517196a82ea3c9c4dc4cf9fbd7d0867"
+source = "git+https://github.com/servo/rust-azure#8ca7e25d5c2c6f66c63b803d24d3bbef13fa9f79"
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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -82,7 +82,7 @@ dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1",
]
@@ -102,7 +102,7 @@ dependencies = [
[[package]]
name = "cgl"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-cgl#851ca1b90081d221c3c38d33548d3e22a19db79f"
+source = "git+https://github.com/servo/cgl-rs#983d3ac5d7e0d9d3509fb502ebe1570dd885e404"
dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -111,10 +111,10 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-x11-clipboard#43afb218871e3148758c603f335576cb101cb1fa"
+source = "git+https://github.com/aweinstock314/rust-clipboard#5ed13c573ce1750a7c71570d03906e9c82962410"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -127,8 +127,8 @@ dependencies = [
[[package]]
name = "cocoa"
-version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#07dcca59b14e154f2b19805eea3ea646c8ea56cb"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -140,9 +140,9 @@ name = "compositing"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "clipboard 0.0.1 (git+https://github.com/servo/rust-x11-clipboard)",
- "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "clipboard 0.0.1 (git+https://github.com/aweinstock314/rust-clipboard)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
@@ -155,12 +155,12 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"profile_traits 0.0.1",
"script_traits 0.0.1",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -172,34 +172,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
]
[[package]]
-name = "core_foundation"
+name = "core-foundation"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-foundation#c8236c28599b07894fa7d6887db2fa91bc7fda24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_graphics"
+name = "core-graphics"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-graphics#2d8d665c5bdd116b4a1addbe5c415735fb78e1a9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_text"
+name = "core-text"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-text#2b4b546718310a9d3fe4273a1df092c79d9fb2c2"
+source = "git+https://github.com/servo/core-text-rs#54080aaa67758917b2f974d8ebebc174ad570f56"
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)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -226,7 +226,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -239,7 +239,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -370,7 +370,7 @@ source = "git+https://github.com/servo/libfreetype2#86730043889cb17694bb65d7355d
[[package]]
name = "gcc"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -387,7 +387,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-geom#270d0246b79fbf86fc2938c4952cae74e4025fcf"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -399,9 +399,9 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
- "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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -422,7 +422,7 @@ dependencies = [
"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)",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -466,15 +466,15 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.26"
-source = "git+https://github.com/servo/glutin?branch=servo#3946d1767654c236d1954d81925a4e306e38cf96"
+source = "git+https://github.com/servo/glutin?branch=servo#3d39d1bb45a6f76be846ed92f946424e24109141"
dependencies = [
"android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.1.0 (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)",
- "glutin_cocoa 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_core_foundation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_core_graphics 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -491,7 +491,7 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -502,40 +502,13 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"script_traits 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
"x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "glutin_cocoa"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "glutin_core_foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "glutin_core_graphics"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glutin_core_foundation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "glx"
version = "0.0.1"
source = "git+https://github.com/servo/rust-glx#60ac0aee2438eadb4b51ddc8eac6fc4b5ca8e447"
@@ -566,7 +539,7 @@ dependencies = [
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -595,20 +568,20 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "io_surface"
+name = "io-surface"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
+source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -641,16 +614,16 @@ 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#842038559a402b37fc8bf4134a4d1329b0607739"
+source = "git+https://github.com/servo/rust-layers#36d02af1bf0d37894fdb77ab3c1860a6e7b554ae"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -767,7 +740,7 @@ name = "miniz-sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -782,10 +755,10 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -810,7 +783,7 @@ dependencies = [
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -832,7 +805,7 @@ dependencies = [
[[package]]
name = "num"
-version = "0.1.24"
+version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -859,10 +832,10 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#13c9f786c55266fa1594cb520fdbc74f45fda809"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#705d8647a48c37b43bc3746e7d0ecd2dfaa70519"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
@@ -888,7 +861,7 @@ name = "openssl-sys"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -960,7 +933,7 @@ name = "png"
version = "0.1.0"
source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
]
@@ -979,7 +952,7 @@ dependencies = [
"profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -987,7 +960,7 @@ dependencies = [
name = "profile_traits"
version = "0.0.1"
dependencies = [
- "time 0.1.25 (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)",
]
@@ -1009,12 +982,12 @@ name = "regex"
version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "regex-syntax 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1049,7 +1022,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -1060,7 +1033,7 @@ dependencies = [
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1115,7 +1088,7 @@ dependencies = [
"profile 0.0.1",
"profile_traits 0.0.1",
"script 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
"webdriver_server 0.0.1",
@@ -1133,7 +1106,7 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#1b0a8f5b3805f510cb155476c5f245ef7a16ca54"
+source = "git+https://github.com/servo/skia#be64840752fdbd0b87e02ac99a92727a8454a2dc"
dependencies = [
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -1191,7 +1164,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
@@ -1205,7 +1178,7 @@ dependencies = [
name = "task_info"
version = "0.0.1"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1223,10 +1196,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1237,7 +1210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "typeable"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1277,7 +1250,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1286,7 +1259,7 @@ dependencies = [
"smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (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)",
]
@@ -1363,15 +1336,6 @@ dependencies = [
]
[[package]]
-name = "xlib"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#184533f276bfad3c78bf06e35ec68f09c18b89c4"
-dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index 8410848c3ad..301e10f77b5 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -8,6 +8,12 @@ name = "embedding"
path = "lib.rs"
crate-type = ["dylib"]
+[dependencies]
+log = "*"
+url = "*"
+libc = "*"
+objc = "0.1"
+
[dependencies.servo]
path = "../../components/servo"
@@ -62,29 +68,19 @@ git = "https://github.com/servo/rust-png"
[dependencies.stb_image]
git = "https://github.com/servo/rust-stb-image"
-[dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
-
-[dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
-
-[dependencies.core_text]
-git = "https://github.com/servo/rust-core-text"
-
-[dependencies.cocoa]
-git = "https://github.com/servo/rust-cocoa"
-
[dependencies.gleam]
git = "https://github.com/servo/gleam"
-[dependencies.cgl]
-git = "https://github.com/servo/rust-cgl"
+[target.x86_64-apple-darwin.dependencies]
+cocoa = "*"
+core-foundation = "*"
+core-graphics = "*"
-[dependencies]
-log = "*"
-url = "*"
-libc = "*"
-objc = "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 = "*"
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index c816d777ec7..97e82ca6d02 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -11,6 +11,12 @@ path = "lib.rs"
window = ["glutin/window"]
headless = ["glutin/headless"]
+[dependencies]
+time = "0.1.12"
+bitflags = "*"
+libc = "*"
+url = "*"
+
[dependencies.compositing]
path = "../../components/compositing"
@@ -39,15 +45,14 @@ branch = "servo"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
-[dependencies.cgl]
-git = "https://github.com/servo/rust-cgl"
-
-[dependencies.egl]
-git = "https://github.com/servo/rust-egl"
+[target.i686-unknown-linux-gnu.dependencies]
+x11 = "*"
-[dependencies]
-time = "0.1.12"
-bitflags = "*"
-libc = "*"
-url = "*"
+[target.x86_64-unknown-linux-gnu.dependencies]
x11 = "*"
+
+[target.x86_64-apple-darwin.dependencies.cgl]
+git = "https://github.com/servo/cgl-rs"
+
+[target.arm-linux-androideabi.dependencies.egl]
+git = "https://github.com/servo/rust-egl"
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index b360649255c..f7942caf94a 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -7,8 +7,7 @@
#![feature(box_syntax)]
#[macro_use] extern crate bitflags;
-#[cfg(target_os="macos")]
-extern crate cgl;
+#[cfg(target_os="macos")] extern crate cgl;
extern crate compositing;
extern crate geom;
extern crate gleam;
@@ -20,7 +19,7 @@ extern crate net;
#[cfg(feature = "window")] extern crate script_traits;
extern crate time;
extern crate util;
-extern crate egl;
+#[cfg(target_os="android")] extern crate egl;
extern crate url;
#[cfg(target_os="linux")] extern crate x11;
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index fa07a9a584e..d8491d2e30c 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -20,7 +20,7 @@ dependencies = [
"script 0.0.1",
"script_traits 0.0.1",
"servo 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -28,11 +28,11 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#5b9f2dbe7517196a82ea3c9c4dc4cf9fbd7d0867"
+source = "git+https://github.com/servo/rust-azure#8ca7e25d5c2c6f66c63b803d24d3bbef13fa9f79"
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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -69,7 +69,7 @@ dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"util 0.0.1",
]
@@ -89,7 +89,7 @@ dependencies = [
[[package]]
name = "cgl"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-cgl#851ca1b90081d221c3c38d33548d3e22a19db79f"
+source = "git+https://github.com/servo/cgl-rs#983d3ac5d7e0d9d3509fb502ebe1570dd885e404"
dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -98,10 +98,10 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.1"
-source = "git+https://github.com/servo/rust-x11-clipboard#43afb218871e3148758c603f335576cb101cb1fa"
+source = "git+https://github.com/aweinstock314/rust-clipboard#5ed13c573ce1750a7c71570d03906e9c82962410"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -117,9 +117,9 @@ name = "compositing"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "clipboard 0.0.1 (git+https://github.com/servo/rust-x11-clipboard)",
- "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "clipboard 0.0.1 (git+https://github.com/aweinstock314/rust-clipboard)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
@@ -132,12 +132,12 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"profile_traits 0.0.1",
"script_traits 0.0.1",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -149,34 +149,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
]
[[package]]
-name = "core_foundation"
+name = "core-foundation"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-foundation#c8236c28599b07894fa7d6887db2fa91bc7fda24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_graphics"
+name = "core-graphics"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-graphics#2d8d665c5bdd116b4a1addbe5c415735fb78e1a9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core_text"
+name = "core-text"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-core-text#2b4b546718310a9d3fe4273a1df092c79d9fb2c2"
+source = "git+https://github.com/servo/core-text-rs#54080aaa67758917b2f974d8ebebc174ad570f56"
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)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -203,7 +203,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -216,7 +216,7 @@ dependencies = [
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -357,7 +357,7 @@ source = "git+https://github.com/servo/libfreetype2#86730043889cb17694bb65d7355d
[[package]]
name = "gcc"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -366,7 +366,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-geom#270d0246b79fbf86fc2938c4952cae74e4025fcf"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -378,9 +378,9 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
- "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)",
- "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@@ -401,7 +401,7 @@ dependencies = [
"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)",
"style 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
]
@@ -473,7 +473,7 @@ dependencies = [
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -502,20 +502,20 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "io_surface"
+name = "io-surface"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
+source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -548,16 +548,16 @@ 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#842038559a402b37fc8bf4134a4d1329b0607739"
+source = "git+https://github.com/servo/rust-layers#36d02af1bf0d37894fdb77ab3c1860a6e7b554ae"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -666,7 +666,7 @@ name = "miniz-sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -681,10 +681,10 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -709,7 +709,7 @@ dependencies = [
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (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)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -731,7 +731,7 @@ dependencies = [
[[package]]
name = "num"
-version = "0.1.24"
+version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -749,10 +749,10 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#13c9f786c55266fa1594cb520fdbc74f45fda809"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#705d8647a48c37b43bc3746e7d0ecd2dfaa70519"
dependencies = [
- "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
+ "cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
+ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
@@ -778,7 +778,7 @@ name = "openssl-sys"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -841,7 +841,7 @@ name = "png"
version = "0.1.0"
source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
]
@@ -860,7 +860,7 @@ dependencies = [
"profile_traits 0.0.1",
"regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
"task_info 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -868,7 +868,7 @@ dependencies = [
name = "profile_traits"
version = "0.0.1"
dependencies = [
- "time 0.1.25 (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)",
]
@@ -890,12 +890,12 @@ name = "regex"
version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "regex-syntax 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -930,7 +930,7 @@ dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.0.1 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -941,7 +941,7 @@ dependencies = [
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
"style 0.0.1",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -995,7 +995,7 @@ dependencies = [
"profile 0.0.1",
"profile_traits 0.0.1",
"script 0.0.1",
- "time 0.1.25 (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)",
"util 0.0.1",
"webdriver_server 0.0.1",
@@ -1004,7 +1004,7 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#1b0a8f5b3805f510cb155476c5f245ef7a16ca54"
+source = "git+https://github.com/servo/skia#be64840752fdbd0b87e02ac99a92727a8454a2dc"
dependencies = [
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
@@ -1062,7 +1062,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
@@ -1076,7 +1076,7 @@ dependencies = [
name = "task_info"
version = "0.0.1"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1094,10 +1094,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1108,7 +1108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "typeable"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1139,7 +1139,7 @@ dependencies = [
"lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1148,7 +1148,7 @@ dependencies = [
"smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "time 0.1.25 (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)",
]
@@ -1220,15 +1220,6 @@ dependencies = [
]
[[package]]
-name = "xlib"
-version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#184533f276bfad3c78bf06e35ec68f09c18b89c4"
-dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"