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

Auto merge of #8757 - servo:skia, r=mbrubeck

Browse source 
Use skia and deps from crates.io.

This makes the initial download for skia go from a 300 MB git repository to a 5 MB tarball. This should help with issues like #6132 and #7687.

Fix https://github.com/servo/skia/issues/70

This builds, but the at the moment causes a number of tidy errors for duplicated crates.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8757)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-03 12:58:29 +05:30
commit 8b95d7b8d8
26 changed files with 805 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/gfx/Cargo.toml
View file

@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
bitflags = "0.3"
euclid = {version = "0.3", features = ["plugins"]}
euclid = {version = "0.4", features = ["plugins"]}
fnv = "1.0"
harfbuzz-sys = "0.1"
lazy_static = "0.1"
@ -26,6 +26,7 @@ string_cache = "0.2"
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5"
servo-skia = "0.20130412.0"
[dependencies.plugins]
path = "../plugins"
@ -59,9 +60,6 @@ features = ["plugins"]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[dependencies.skia]
git = "https://github.com/servo/skia"
[dependencies.script_traits]
path = "../script_traits"
@ -69,23 +67,23 @@ path = "../script_traits"
git = "https://github.com/servo/ipc-channel"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.1"
core-graphics = "0.1"
core-foundation = "0.2"
core-graphics = "0.2"
[target.i686-unknown-linux-gnu.dependencies.fontconfig]
git = "https://github.com/servo/rust-fontconfig"
[target.i686-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"
[target.x86_64-unknown-linux-gnu.dependencies.fontconfig]
git = "https://github.com/servo/rust-fontconfig"
[target.x86_64-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"
[target.arm-unknown-linux-gnueabihf.dependencies.fontconfig]
git = "https://github.com/servo/rust-fontconfig"
[target.arm-unknown-linux-gnueabihf.dependencies]
servo-fontconfig = "0.2"
[target.aarch64-unknown-linux-gnu.dependencies.fontconfig]
git = "https://github.com/servo/rust-fontconfig"
[target.aarch64-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"
[target.arm-linux-androideabi.dependencies.fontconfig]
git = "https://github.com/servo/rust-fontconfig"
[target.arm-linux-androideabi.dependencies]
servo-fontconfig = "0.2"
[target.i686-unknown-linux-gnu.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"