Skip to content

Commit

Permalink
Auto merge of #8947 - Ms2ger:core-text, r=jdm
Browse files Browse the repository at this point in the history
Use core-text from crates.io.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8947)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Dec 12, 2015
2 parents 16de31c + 5440a90 commit 23b2206
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 28 deletions.
4 changes: 1 addition & 3 deletions components/compositing/Cargo.toml
Expand Up @@ -82,6 +82,4 @@ url = "0.5"

[target.x86_64-apple-darwin.dependencies]
core-graphics = "0.2"

[target.x86_64-apple-darwin.dependencies.core-text]
git = "https://github.com/servo/core-text-rs"
core-text = "1.0"
4 changes: 1 addition & 3 deletions components/gfx/Cargo.toml
Expand Up @@ -69,6 +69,7 @@ git = "https://github.com/servo/ipc-channel"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.2"
core-graphics = "0.2"
core-text = "1.0"

[target.i686-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"
Expand Down Expand Up @@ -100,9 +101,6 @@ 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"

[target.x86_64-unknown-linux-gnu.dependencies.simd]
git = "https://github.com/huonw/simd"

Expand Down
12 changes: 6 additions & 6 deletions components/servo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ports/cef/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions ports/cef/Cargo.toml
Expand Up @@ -70,11 +70,9 @@ objc = "0.1"
cocoa = "0.1"
core-foundation = "0.2"
core-graphics = "0.2"
core-text = "1.0"
cgl = "0.1"

[target.x86_64-apple-darwin.dependencies.core-text]
git = "https://github.com/servo/core-text-rs"

[target.i686-unknown-linux-gnu.dependencies]
x11 = "2.3"

Expand Down
12 changes: 6 additions & 6 deletions ports/gonk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 23b2206

Please sign in to comment.