Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11041 - fabricedesre:armv7, r=larsbergstrom

Browse source 
armv7 update

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11041)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-10 11:54:42 -07:00
commit 82cc51280e
3 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

44
components/servo/Cargo.lock generated
View file

@ -19,7 +19,7 @@ dependencies = [
"glutin_app 0.0.1",
"image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"layout 0.0.1",
"layout_tests 0.0.1",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -96,8 +96,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.4.4"
source = "git+https://github.com/servo/rust-azure#7b0164d1d79957b2a59e9e103c02a53761c74b9d"
version = "0.4.5"
source = "git+https://github.com/servo/rust-azure#2bb16866125ef3b607448dd3d865076a41bc9e02"
dependencies = [
"core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -111,7 +111,7 @@ dependencies = [
"serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -191,7 +191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "canvas"
version = "0.0.1"
dependencies = [
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"canvas_traits 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
@ -209,7 +209,7 @@ dependencies = [
name = "canvas_traits"
version = "0.0.1"
dependencies = [
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
@ -311,7 +311,7 @@ name = "compositing"
version = "0.0.1"
dependencies = [
"app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
@ -323,7 +323,7 @@ dependencies = [
"gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
@ -721,7 +721,7 @@ name = "gfx"
version = "0.0.1"
dependencies = [
"app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -734,7 +734,7 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -749,7 +749,7 @@ dependencies = [
"serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.8 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.0 (git+https://github.com/huonw/simd)",
"smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -776,11 +776,11 @@ dependencies = [
name = "gfx_traits"
version = "0.0.1"
dependencies = [
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
"plugins 0.0.1",
"serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -827,7 +827,7 @@ dependencies = [
"compositing 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
"net_traits 0.0.1",
"script_traits 0.0.1",
@ -1073,10 +1073,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.2.4"
source = "git+https://github.com/servo/rust-layers#d7a8a6aa73ec16127042325af4b2d5f9a1fa585d"
version = "0.2.5"
source = "git+https://github.com/servo/rust-layers#0a44672108ff33dc9675e4b72a398801c74ee6fe"
dependencies = [
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1089,7 +1089,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-skia 0.20130412.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1098,7 +1098,7 @@ name = "layout"
version = "0.0.1"
dependencies = [
"app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.4 (git+https://github.com/servo/rust-azure)",
"azure 0.4.5 (git+https://github.com/servo/rust-azure)",
"bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
"cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1316,7 +1316,7 @@ dependencies = [
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"layers 0.2.5 (git+https://github.com/servo/rust-layers)",
"plugins 0.0.1",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2030,7 +2030,7 @@ dependencies = [
[[package]]
name = "servo-skia"
version = "0.20130412.6"
version = "0.20130412.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2466,7 +2466,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
source = "git+https://github.com/servo/webrender#e3ee5d46093d0b2bb3c14398914bc9a7a36bcfbd"
source = "git+https://github.com/servo/webrender#5f461db430272f81076bad17188c1f964e85f3b2"
dependencies = [
"app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",