summaryrefslogtreecommitdiffstats
path: root/servo-freetype-proxy
diff options
context:
space:
mode:
authorJon Gjengset <jon@thesquareplanet.com>2018-09-30 16:44:14 -0400
committerChristian Duerr <chrisduerr@users.noreply.github.com>2018-09-30 20:44:14 +0000
commitf785f88a58daa3919255a268fa1da62aa07f13a7 (patch)
treea5989c6ccc924739f5c48330d8bd26b64bc7a47b /servo-freetype-proxy
parente01317d88593af7874da13c2043aa53336fb2d73 (diff)
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.
Diffstat (limited to 'servo-freetype-proxy')
-rw-r--r--servo-freetype-proxy/Cargo.toml11
-rw-r--r--servo-freetype-proxy/README.md4
-rw-r--r--servo-freetype-proxy/src/lib.rs2
3 files changed, 17 insertions, 0 deletions
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 <jon@thesquareplanet.com>"]
+
+[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::*;