diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/gfx/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 12 |
3 files changed, 8 insertions, 12 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index e076bef55ad..8276b24c1af 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -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" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 43eb0ce75b0..4a29c9ea89d 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -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" @@ -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" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 12a51f8c100..0f6956e6b82 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -92,11 +92,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" version = "0.2.1" -source = "git+https://github.com/servo/rust-azure#b8a761c2d4bc6ee1fa62e1c34763c2f5a7650779" +source = "git+https://github.com/servo/rust-azure#b05ba4bb70aefb319c7f168fc83a9fd04a1aa1ef" dependencies = [ "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-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)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -248,7 +248,7 @@ dependencies = [ "canvas_traits 0.0.1", "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-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", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)", @@ -315,8 +315,8 @@ dependencies = [ [[package]] name = "core-text" -version = "0.1.0" -source = "git+https://github.com/servo/core-text-rs#d97cd4ae33509857f956e64c71f43cc71c98430f" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", @@ -611,7 +611,7 @@ dependencies = [ "canvas_traits 0.0.1", "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-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)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", |