From e9ff6d9ce7e547bffdcd93a4456850d5d71eac35 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Mon, 17 Nov 2014 09:45:56 +1000 Subject: [PATCH 1/2] Update green-rs submodule to get android tls fix. --- Cargo.lock | 8 ++++---- ports/android/glut_app/Cargo.lock | 8 ++++---- ports/cef/Cargo.lock | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a0da9595bd..29b8e89cf86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,7 +295,7 @@ dependencies = [ [[package]] name = "green" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" [[package]] name = "harfbuzz" @@ -481,10 +481,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459 [[package]] name = "rustuv" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" dependencies = [ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", - "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", + "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)", ] [[package]] @@ -585,7 +585,7 @@ version = "0.0.1" [[package]] name = "tls" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85" [[package]] name = "url" diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock index ad28f6f5dfb..f75d9ca4776 100644 --- a/ports/android/glut_app/Cargo.lock +++ b/ports/android/glut_app/Cargo.lock @@ -273,7 +273,7 @@ dependencies = [ [[package]] name = "green" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" [[package]] name = "harfbuzz" @@ -464,10 +464,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459 [[package]] name = "rustuv" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" dependencies = [ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", - "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", + "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)", ] [[package]] @@ -579,7 +579,7 @@ version = "0.0.1" [[package]] name = "tls" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85" [[package]] name = "url" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 7e420f55e33..e9915dd380c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "green" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" [[package]] name = "harfbuzz" @@ -489,10 +489,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459 [[package]] name = "rustuv" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d" dependencies = [ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", - "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", + "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)", ] [[package]] @@ -610,7 +610,7 @@ version = "0.0.1" [[package]] name = "tls" version = "0.0.1" -source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" +source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85" [[package]] name = "url" From a1de810dd3290cd36156be66a3a4e5d65bbe02a2 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Mon, 17 Nov 2014 12:13:58 +1000 Subject: [PATCH 2/2] Add missing gfx dependency, that was causing a race in cargo on the build machine. --- Cargo.lock | 1 + components/gfx/Cargo.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 29b8e89cf86..42fbd5cd6e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,6 +227,7 @@ dependencies = [ "net 0.0.1", "plugins 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "script_traits 0.0.1", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "style 0.0.1", "url 0.1.0 (git+https://github.com/servo/rust-url)", diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index ad62df8fd92..0c0f84ec105 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -59,4 +59,6 @@ git = "https://github.com/servo/rust-core-graphics" [dependencies.core_text] git = "https://github.com/servo/rust-core-text" +[dependencies.script_traits] +path = "../script_traits"