From 6916537858d12e02478d618339d1b9f0e73a677a Mon Sep 17 00:00:00 2001 From: Joe Wilm Date: Sun, 8 Oct 2017 22:33:01 -0700 Subject: [PATCH] Update servo-fontconfig-sys fork Fixes naming collision issue on Fedora 26. --- Cargo.lock | 16 ++++++++-------- font/Cargo.lock | 16 ++++++++-------- font/Cargo.toml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ad39c5f..61404aeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,7 @@ dependencies = [ "freetype-rs 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-fontconfig 0.2.0 (git+https://github.com/jwilm/rust-fontconfig)", + "servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)", ] [[package]] @@ -1008,17 +1008,17 @@ dependencies = [ [[package]] name = "servo-fontconfig" -version = "0.2.0" -source = "git+https://github.com/jwilm/rust-fontconfig#419135e5e1106ec0973dd4923bd9c70d8e438cc8" +version = "0.4.0" +source = "git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8#be2b94de833ec69cf767186262a5fb8360fa5b45" dependencies = [ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-fontconfig-sys 2.11.3 (git+https://github.com/jwilm/libfontconfig)", + "servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)", ] [[package]] name = "servo-fontconfig-sys" -version = "2.11.3" -source = "git+https://github.com/jwilm/libfontconfig#618a52973d46e5cce4f054f6ee3bd2682167eee4" +version = "4.0.3" +source = "git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8#5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b" dependencies = [ "expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1500,8 +1500,8 @@ dependencies = [ "checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b" "checksum serde_yaml 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49d983aa39d2884a4b422bb11bb38f4f48fa05186e17469bc31e47d01e381111" -"checksum servo-fontconfig 0.2.0 (git+https://github.com/jwilm/rust-fontconfig)" = "" -"checksum servo-fontconfig-sys 2.11.3 (git+https://github.com/jwilm/libfontconfig)" = "" +"checksum servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)" = "" +"checksum servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)" = "" "checksum shared_library 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "7822f9d0814224552cfd7e4ac72cd511740ccec0b811d1c0f9fa2a84c6509cee" "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d" "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" diff --git a/font/Cargo.lock b/font/Cargo.lock index 7cbf700b..b7ff2135 100644 --- a/font/Cargo.lock +++ b/font/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "freetype-rs 0.13.0 (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)", - "servo-fontconfig 0.2.0 (git+https://github.com/jwilm/rust-fontconfig)", + "servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)", ] [[package]] @@ -171,17 +171,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "servo-fontconfig" -version = "0.2.0" -source = "git+https://github.com/jwilm/rust-fontconfig#419135e5e1106ec0973dd4923bd9c70d8e438cc8" +version = "0.4.0" +source = "git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8#be2b94de833ec69cf767186262a5fb8360fa5b45" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-fontconfig-sys 2.11.3 (git+https://github.com/jwilm/libfontconfig)", + "servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)", ] [[package]] name = "servo-fontconfig-sys" -version = "2.11.3" -source = "git+https://github.com/jwilm/libfontconfig#618a52973d46e5cce4f054f6ee3bd2682167eee4" +version = "4.0.3" +source = "git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8#5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b" dependencies = [ "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -220,7 +220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" "checksum rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b" "checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -"checksum servo-fontconfig 0.2.0 (git+https://github.com/jwilm/rust-fontconfig)" = "" -"checksum servo-fontconfig-sys 2.11.3 (git+https://github.com/jwilm/libfontconfig)" = "" +"checksum servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)" = "" +"checksum servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)" = "" "checksum winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3969e500d618a5e974917ddefd0ba152e4bcaae5eb5d9b8c1fbc008e9e28c24e" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/font/Cargo.toml b/font/Cargo.toml index 0aca1ae0..2a97f0bd 100644 --- a/font/Cargo.toml +++ b/font/Cargo.toml @@ -12,7 +12,7 @@ foreign-types = "0.2.0" log = "0.3" [target.'cfg(not(target_os = "macos"))'.dependencies] -servo-fontconfig = { git = "https://github.com/jwilm/rust-fontconfig" } +servo-fontconfig = { git = "https://github.com/jwilm/rust-fontconfig", branch = "updated-2017-10-8" } freetype-rs = "0.13.0" [target.'cfg(target_os = "macos")'.dependencies]