[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 .travis.yml |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3a48c776701a919e11b067129586e40372d90d54
Merge: 9230911 4b4948d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jan 2 00:59:14 2016 +0000

    Merge pull request #208 from khaledhosny/travis-trusty
    
    [travis] Try building on Trusty

commit 4b4948d360a2141e0ffda2994aa308645dc32f59
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jan 2 00:36:19 2016 +0400

    [travis] Try building on Trusty
    
    Trusty has gtk-doc 1.20 which has better markdown support which should
    fix some of the brokenness in the newly added documentation. The build
    seems to be as fast as the current container-based build on Precise.

diff --git a/.travis.yml b/.travis.yml
index 05d9647..f37b4b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
 # Build Configuration for Travis
-sudo: false # Use Travis docker infrastructure
+sudo: required # For Trusty beta
 os:
   - linux
   - osx
+dist: trusty
 language: cpp
 compiler:
   - clang
@@ -11,7 +12,7 @@ env:
   global:
     - CPPFLAGS=""
     - CFLAGS="-Werror --coverage"
-    - CXXFLAGS="-Werror --coverage"
+    - CXXFLAGS="-Werror -Wno-deprecated-register --coverage" # glib uses register and clang raises a warning
     - LDFLAGS="--coverage"
 install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user nose; fi