From f785f88a58daa3919255a268fa1da62aa07f13a7 Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Sun, 30 Sep 2018 16:44:14 -0400 Subject: Bump fontconfig dependencies The patch uses the Cargo.toml patch section to force a single downstream choice of freetype-sys instead of relying on forks of other crates. It also bumps the fontconfig/freetype dependencies in the process. --- servo-freetype-proxy/Cargo.toml | 11 +++++++++++ servo-freetype-proxy/README.md | 4 ++++ servo-freetype-proxy/src/lib.rs | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 servo-freetype-proxy/Cargo.toml create mode 100644 servo-freetype-proxy/README.md create mode 100644 servo-freetype-proxy/src/lib.rs (limited to 'servo-freetype-proxy') diff --git a/servo-freetype-proxy/Cargo.toml b/servo-freetype-proxy/Cargo.toml new file mode 100644 index 00000000..83342ddf --- /dev/null +++ b/servo-freetype-proxy/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "servo-freetype-sys" +version = "4.0.3" +authors = ["Jon Gjengset "] + +[lib] +name = "freetype_sys" +path = "src/lib.rs" + +[dependencies] +freetype-sys = "*" diff --git a/servo-freetype-proxy/README.md b/servo-freetype-proxy/README.md new file mode 100644 index 00000000..e31c468b --- /dev/null +++ b/servo-freetype-proxy/README.md @@ -0,0 +1,4 @@ +This crate only exists to allow us to force `servo-fontconfig-sys` to +use `freetype-sys` instead of `servo-freetype-sys`, which is in turn +needed so that we don't try to link with `freetype` multiple times from +different crates. diff --git a/servo-freetype-proxy/src/lib.rs b/servo-freetype-proxy/src/lib.rs new file mode 100644 index 00000000..73ce1ac5 --- /dev/null +++ b/servo-freetype-proxy/src/lib.rs @@ -0,0 +1,2 @@ +extern crate freetype_sys; +pub use freetype_sys::*; -- cgit