build our own harfbuzz for broader compat

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "harfbuzz/harfbuzz"]
+	path = harfbuzz/harfbuzz
+	url = https://github.com/harfbuzz/harfbuzz.git

.travis.yml

@@ -1,5 +1,3 @@
-# Note that travis has been disabled because the Trusty harfbuzz
-# library doesn't have `hb_ft_font_create_referenced` and we require it
 language: rust
 rust:
   #  - stable  we use a feature flag that precludes this
@@ -13,4 +11,4 @@ script:
   - cargo test --verbose --all
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y libxcb-icccm4-dev libxcb-ewmh-dev libxcb-image0-dev libxcb-keysyms1-dev libharfbuzz-dev libfontconfig1-dev libfreetype6-dev
+  - sudo apt-get install -y libxcb-icccm4-dev libxcb-ewmh-dev libxcb-keysyms1-dev libfontconfig1-dev libfreetype6-dev

Cargo.toml

@@ -8,9 +8,7 @@ bitflags = "1.0.1"
 egli = "0.4.0"
 euclid = "0.17.0"
 failure = "0.1.1"
-freetype = "0.3.0"
 gl = "0.10.0"
-harfbuzz-sys = "0.1.15"
 libc = "0.2.36"
 mio = "0.6.12"
 palette = "0.2.1"
@@ -24,17 +22,23 @@ unicode-width = "0.1.4"
 default-features = false
 version = "0.20.0"
 
+[dependencies.harfbuzz]
+path = "harfbuzz"
+
 [dependencies.term]
 path = "term"
 
-[dependencies.x11]
+[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
+freetype = "0.3"
+
+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies.x11]
 features = ["xlib"]
 version = "2.17.2"
 
-[dependencies.xcb]
+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies.xcb]
 version = "0.8.1"
 
-[dependencies.xcb-util]
+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies.xcb-util]
 features = [
     "icccm",
     "ewmh",

harfbuzz/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+authors = ["Wez Furlong <wez@wezfurlong.org>"]
+name = "harfbuzz"
+version = "0.1.0"
+
+[build-dependencies]
+cmake = "0.1.29"
+
+[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
+freetype = "0.3"

harfbuzz/build.rs

@@ -0,0 +1,16 @@
+extern crate cmake;
+use std::env;
+
+fn main() {
+    let dst = cmake::Config::new("harfbuzz")
+        .define("HB_HAVE_FREETYPE", "ON")
+        .build();
+    println!("cargo:rustc-link-search=native={}/lib", dst.display());
+    println!("cargo:rustc-link-lib=static=harfbuzz");
+
+    // Dependent crates that need to find hb.h can use DEP_HARFBUZZ_INCLUDE from their build.rs.
+    println!(
+        "cargo:include={}",
+        env::current_dir().unwrap().join("harfbuzz/src").display()
+    );
+}