From 46824616d2a9a823ac1ab5aea8d2f131ffcc25c7 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 12 Feb 2015 08:17:36 +0530 Subject: [PATCH] Make gonk compile again --- components/compositing/Cargo.toml | 4 ++-- components/net/Cargo.toml | 2 +- components/servo/Cargo.lock | 24 ++++++++++++------------ ports/cef/Cargo.lock | 24 ++++++++++++------------ ports/gonk/.cargo/config | 3 +++ ports/gonk/Cargo.lock | 27 ++++++++++++++++----------- ports/gonk/Cargo.toml | 11 +++++++++++ ports/gonk/src/input.rs | 2 +- 8 files changed, 58 insertions(+), 39 deletions(-) diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 12fbba2bd4f..dbbc9f4f7f8 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -51,5 +51,5 @@ git = "https://github.com/servo/gleam" [dependencies] url = "0.2.16" -time = "0.1.12" -libc = "*" +time = "0.1.17" +libc = "*" \ No newline at end of file diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 1cf05766926..dc8bfd9b2b1 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -25,7 +25,7 @@ git = "https://github.com/servo/rust-stb-image" [dependencies] url = "0.2.16" -time = "0.1.12" +time = "0.1.17" openssl="0.3.1" rustc-serialize = "0.2" cookie="*" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 77e602ed704..5fc90457983 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -104,7 +104,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script_traits 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -116,7 +116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -159,7 +159,7 @@ dependencies = [ "devtools_traits 0.0.1", "msg 0.0.1", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -316,7 +316,7 @@ dependencies = [ "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -383,7 +383,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -413,7 +413,7 @@ dependencies = [ "phf_macros 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -432,7 +432,7 @@ dependencies = [ "mucell 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "unsafe-any 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -605,7 +605,7 @@ dependencies = [ "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -715,7 +715,7 @@ dependencies = [ "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.9 (git+https://github.com/rust-lang/uuid)", @@ -798,7 +798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -849,7 +849,7 @@ dependencies = [ "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "task_info 0.0.1", "text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 25a39203e7c..9a8f5fe14bd 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -107,7 +107,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script_traits 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -119,7 +119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -162,7 +162,7 @@ dependencies = [ "devtools_traits 0.0.1", "msg 0.0.1", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -319,7 +319,7 @@ dependencies = [ "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -386,7 +386,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -416,7 +416,7 @@ dependencies = [ "phf_macros 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -435,7 +435,7 @@ dependencies = [ "mucell 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "unsafe-any 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -613,7 +613,7 @@ dependencies = [ "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -723,7 +723,7 @@ dependencies = [ "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.9 (git+https://github.com/rust-lang/uuid)", @@ -756,7 +756,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -825,7 +825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -876,7 +876,7 @@ dependencies = [ "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "task_info 0.0.1", "text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/.cargo/config b/ports/gonk/.cargo/config index e4951060177..a4d8b3b6fdb 100644 --- a/ports/gonk/.cargo/config +++ b/ports/gonk/.cargo/config @@ -1,3 +1,6 @@ [target.arm-linux-androideabi] ar = "arm-linux-androideabi-ar" linker = "arm-linux-androideabi-g++" + +[target.arm-linux-androideabi.openssl] +rustc-flags = "-l crypto -l ssl" \ No newline at end of file diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 5172c7a3c12..686cb28af0e 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -6,12 +6,17 @@ dependencies = [ "devtools 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)", + "gfx 0.0.1", + "gleam 0.0.1 (git+https://github.com/servo/gleam)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layout 0.0.1", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", + "net 0.0.1", "script 0.0.1", "servo 0.0.1", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -72,7 +77,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script_traits 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -84,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -127,7 +132,7 @@ dependencies = [ "devtools_traits 0.0.1", "msg 0.0.1", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -276,7 +281,7 @@ dependencies = [ "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -336,7 +341,7 @@ dependencies = [ "phf_macros 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -355,7 +360,7 @@ dependencies = [ "mucell 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "unsafe-any 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -520,7 +525,7 @@ dependencies = [ "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -630,7 +635,7 @@ dependencies = [ "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.9 (git+https://github.com/rust-lang/uuid)", @@ -662,7 +667,7 @@ dependencies = [ "net 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "script 0.0.1", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -731,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -774,7 +779,7 @@ dependencies = [ "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "task_info 0.0.1", "text_writer 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml index 574eab7c26f..5889da21f27 100644 --- a/ports/gonk/Cargo.toml +++ b/ports/gonk/Cargo.toml @@ -20,6 +20,12 @@ path = "../../components/msg" [dependencies.script] path = "../../components/script" +[dependencies.net] +path = "../../components/net" + +[dependencies.gfx] +path = "../../components/gfx" + [dependencies.layout] path = "../../components/layout" @@ -36,5 +42,10 @@ path = "../../components/util" [dependencies.egl] git = "https://github.com/servo/rust-egl" +[dependencies.gleam] +git = "https://github.com/servo/gleam" + [dependencies] +url = "0.2.16" +time = "0.1.17" libc = "*" diff --git a/ports/gonk/src/input.rs b/ports/gonk/src/input.rs index 26ec396dbc4..10d3e7e114d 100644 --- a/ports/gonk/src/input.rs +++ b/ports/gonk/src/input.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use std::path::Path; +use std::old_path::Path; use std::mem::size_of; use std::mem::transmute; use std::mem::zeroed;