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

[Behdad Esfahbod]

 .circleci/config.yml                                                    |    9 +++++++++
 dev/null                                                                |binary
 test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf |binary
 test/shaping/tests/cluster.tests                                        |    4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 260246a279699d313a45583c6a61e4bab717f739
Author: ebraminio <ebrahim at gnu.org>
Date:   Wed Nov 1 14:10:55 2017 -0700

    [ci] Add Fedora builder (#598)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 336a200c..630ab0b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,6 +2,14 @@ version: 2
 
 jobs:
 
+  fedora:
+    docker:
+      - image: fedora
+    steps:
+      - checkout
+      - run: dnf install -y pkg-config ragel gcc gcc-c++ automake autoconf libtool make which glib2-devel freetype-devel || true
+      - run: ./autogen.sh && make && make check
+
   freebsd9:
     docker:
       - image: donbowman/freebsd-cross-build
@@ -71,6 +79,7 @@ workflows:
   version: 2
   build:
     jobs:
+      - fedora
       - freebsd9
       - base
       - psvita
commit 0e63cbed9cceb1d0238974ddfa9bc68d25d9c616
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Nov 1 20:49:42 2017 +0200

    [test] Fix difference between ft and ot font funcs
    
    See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341194673.
    
    I simply removed the composite glyph and use the referenced simple
    glyph directly.

diff --git a/test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf b/test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf
new file mode 100644
index 00000000..0f691e1d
Binary files /dev/null and b/test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf differ
diff --git a/test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf b/test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf
deleted file mode 100644
index 33c4229c..00000000
Binary files a/test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf and /dev/null differ
diff --git a/test/shaping/tests/cluster.tests b/test/shaping/tests/cluster.tests
index 24f04ddf..29580bfd 100644
--- a/test/shaping/tests/cluster.tests
+++ b/test/shaping/tests/cluster.tests
@@ -1,2 +1,2 @@
-fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf:--cluster-level=2:U+0078,U+030A,U+0058,U+030A:[gid2=0+1083|gid4=1 at -555,-8+0|gid1=2+1200|gid4=3 at -614,349+0]
+fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf:--cluster-level=2:U+0078,U+030A,U+0058,U+030A:[gid2=0+1083|gid3=1 at -1131,-8+0|gid1=2+1200|gid3=3 at -1190,349+0]
 fonts/sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf:--cluster-level=1:U+05D4,U+05B7,U+05E9,U+05BC,U+05C1,U+05B8,U+05DE,U+05B4,U+05DD:[uni05DD=8+1359|uni05B4=7 at 111,0+0|uni05DE=6+1391|uni05B8=5+0|uni05BC=3+0|uni05C1=3+0|uni05E9=2+1451|uni05B7=1 at 28,0+0|uni05D4=0+1338]
commit 0b8f8dd869212ed2889cbdb79c4c4b639b8eff7a
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Nov 1 20:33:43 2017 +0200

    Revert "[test] We don’t care about glyph positions here"
    
    This reverts commit 70137e2b4b46918d9608f824a4b4b5cef2819158.

diff --git a/test/shaping/tests/cluster.tests b/test/shaping/tests/cluster.tests
index 19da4cab..24f04ddf 100644
--- a/test/shaping/tests/cluster.tests
+++ b/test/shaping/tests/cluster.tests
@@ -1,2 +1,2 @@
-fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf:--cluster-level=2 --no-positions:U+0078,U+030A,U+0058,U+030A:[gid2=0|gid4=1|gid1=2|gid4=3]
-fonts/sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf:--cluster-level=1 --no-positions:U+05D4,U+05B7,U+05E9,U+05BC,U+05C1,U+05B8,U+05DE,U+05B4,U+05DD:[uni05DD=8|uni05B4=7|uni05DE=6|uni05B8=5|uni05BC=3|uni05C1=3|uni05E9=2|uni05B7=1|uni05D4=0]
+fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf:--cluster-level=2:U+0078,U+030A,U+0058,U+030A:[gid2=0+1083|gid4=1 at -555,-8+0|gid1=2+1200|gid4=3 at -614,349+0]
+fonts/sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf:--cluster-level=1:U+05D4,U+05B7,U+05E9,U+05BC,U+05C1,U+05B8,U+05DE,U+05B4,U+05DD:[uni05DD=8+1359|uni05B4=7 at 111,0+0|uni05DE=6+1391|uni05B8=5+0|uni05BC=3+0|uni05C1=3+0|uni05E9=2+1451|uni05B7=1 at 28,0+0|uni05D4=0+1338]