Skip to content

Commit

Permalink
Auto merge of #78 - mbrubeck:update, r=jdm
Browse files Browse the repository at this point in the history
Update to harfbuzz 1.4.8.

Update the bundled Harfbuzz source to 1.4.8, and regenerate bindings.  This is a non-breaking change (tested against Servo and some other downstream crates).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-harfbuzz/78)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 22, 2017
2 parents 25b6663 + 79e78bf commit a308319
Show file tree
Hide file tree
Showing 508 changed files with 54,771 additions and 22,488 deletions.
4 changes: 2 additions & 2 deletions harfbuzz-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "harfbuzz-sys"
version = "0.1.12"
version = "0.1.13"

authors = ["The Servo Project Developers"]
license = "MIT"

description = "Rust bindings to the HarfBuzz text shaping engine"
repository = "https://github.com/servo/rust-harfbuzz"
documentation = "http://doc.servo.org/harfbuzz_sys/"
documentation = "https://docs.rs/harfbuzz-sys/"
keywords = ["opentype", "font", "text", "layout", "unicode"]

links = "harfbuzz"
Expand Down
106 changes: 0 additions & 106 deletions harfbuzz-sys/harfbuzz/Android.mk

This file was deleted.

36 changes: 36 additions & 0 deletions harfbuzz-sys/harfbuzz/BUILD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
On Linux, install the development packages for FreeType,
Cairo, and GLib. For example, on Ubuntu / Debian, you would do:
* sudo apt-get install gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev

whereas on Fedora, RHEL, CentOS, and other Red Hat based systems you would do:
* sudo yum install gcc gcc-c++ freetype-devel glib2-devel cairo-devel

on the Mac, using MacPorts:
* sudo port install freetype glib2 cairo

or using Homebrew:
* brew install freetype glib cairo

If you are using a tarball, you can now proceed to running configure and make
as with any other standard package. That should leave you with a shared
library in src/, and a few utility programs including hb-view and hb-shape
under util/. From the tarball, NMake Makefiles are also provided in win32/,
which supports building HarfBuzz using Visual Studio, with a README.txt that
gives instructions on building using NMake.
If you are bootstraping from git, you need a few more tools before you can
run autogen.sh for the first time. Namely, pkg-config and ragel. Again,
on Ubuntu / Debian:
* sudo apt-get install autoconf automake libtool pkg-config ragel gtk-doc-tools

and on Fedora, RHEL, CentOS:
* sudo yum install autoconf automake libtool pkgconfig ragel gtk-doc

on the Mac, using MacPorts:
* sudo port install autoconf automake libtool pkgconfig ragel gtk-doc

or using Homebrew:
* brew install autoconf automake libtool pkgconfig ragel gtk-doc

To build the Python bindings, you also need:

* brew install pygobject3
Loading

0 comments on commit a308319

Please sign in to comment.