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

Auto merge of #8947 - Ms2ger:core-text, r=jdm

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-12-12 13:27:45 +05:30
commit 23b220644c
6 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/Cargo.toml
View file

@ -82,6 +82,4 @@ url = "0.5"
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]
core-graphics = "0.2" core-graphics = "0.2"
core-text = "1.0"
[target.x86_64-apple-darwin.dependencies.core-text]
git = "https://github.com/servo/core-text-rs"

4
components/gfx/Cargo.toml
View file

@ -69,6 +69,7 @@ git = "https://github.com/servo/ipc-channel"
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]
core-foundation = "0.2" core-foundation = "0.2"
core-graphics = "0.2" core-graphics = "0.2"
core-text = "1.0"
[target.i686-unknown-linux-gnu.dependencies] [target.i686-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2" servo-fontconfig = "0.2"
@ -100,9 +101,6 @@ git = "https://github.com/servo/rust-freetype"
[target.arm-linux-androideabi.dependencies.freetype] [target.arm-linux-androideabi.dependencies.freetype]
git = "https://github.com/servo/rust-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] [target.x86_64-unknown-linux-gnu.dependencies.simd]
git = "https://github.com/huonw/simd" git = "https://github.com/huonw/simd"

12
components/servo/Cargo.lock generated
View file

@ -92,11 +92,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "azure" name = "azure"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/rust-azure#b8a761c2d4bc6ee1fa62e1c34763c2f5a7650779" source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -248,7 +248,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)", "clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/pcwalton/gaol)", "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
@ -315,8 +315,8 @@ dependencies = [
[[package]] [[package]]
name = "core-text" name = "core-text"
version = "0.1.0" version = "1.0.0"
source = "git+https://github.com/servo/core-text-rs#d97cd4ae33509857f956e64c71f43cc71c98430f" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -611,7 +611,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",

14
ports/cef/Cargo.lock generated
View file

@ -8,7 +8,7 @@ dependencies = [
"compositing 0.0.1", "compositing 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools 0.0.1", "devtools 0.0.1",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx 0.0.1", "gfx 0.0.1",
@ -81,11 +81,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "azure" name = "azure"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/rust-azure#b8a761c2d4bc6ee1fa62e1c34763c2f5a7650779" source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -248,7 +248,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)", "clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/pcwalton/gaol)", "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
@ -315,8 +315,8 @@ dependencies = [
[[package]] [[package]]
name = "core-text" name = "core-text"
version = "0.1.0" version = "1.0.0"
source = "git+https://github.com/servo/core-text-rs#d97cd4ae33509857f956e64c71f43cc71c98430f" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -578,7 +578,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",

4
ports/cef/Cargo.toml
View file

@ -70,11 +70,9 @@ objc = "0.1"
cocoa = "0.1" cocoa = "0.1"
core-foundation = "0.2" core-foundation = "0.2"
core-graphics = "0.2" core-graphics = "0.2"
core-text = "1.0"
cgl = "0.1" 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] [target.i686-unknown-linux-gnu.dependencies]
x11 = "2.3" x11 = "2.3"

12
ports/gonk/Cargo.lock generated
View file

@ -72,11 +72,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "azure" name = "azure"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/rust-azure#b8a761c2d4bc6ee1fa62e1c34763c2f5a7650779" source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -228,7 +228,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)", "clipboard 0.1.0 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/pcwalton/gaol)", "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
@ -295,8 +295,8 @@ dependencies = [
[[package]] [[package]]
name = "core-text" name = "core-text"
version = "0.1.0" version = "1.0.0"
source = "git+https://github.com/servo/core-text-rs#d97cd4ae33509857f956e64c71f43cc71c98430f" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -576,7 +576,7 @@ dependencies = [
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",