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

[Behdad Esfahbod]

 NEWS                                                                    |    7 +++++++
 configure.ac                                                            |    2 +-
 test/shaping/Makefile.am                                                |    1 +
 test/shaping/fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf |binary
 test/shaping/tests/mark-filtering-sets.tests                            |    5 +++++
 5 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit a0331b55f7b45437980e1fc323251f4091bf2c4e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 4 16:25:32 2016 -0700

    1.2.5

diff --git a/NEWS b/NEWS
index d211749..71036b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Overview of changes leading to 1.2.5
+Monday, April 4, 2016
+====================================
+
+- Fix GDEF mark-filtering-set, which was broken in 1.2.3.
+
+
 Overview of changes leading to 1.2.4
 Thursday, March 17, 2016
 ====================================
diff --git a/configure.ac b/configure.ac
index 5960331..e3eb262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [1.2.4],
+        [1.2.5],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
commit 6e55199b5f097ac93bad38f32e9813e2da14c5a7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 4 16:24:27 2016 -0700

    Add test for 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8

diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index e70dff7..6320b02 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -54,6 +54,7 @@ TESTS = \
 	tests/indic-old-spec.tests \
 	tests/indic-pref-blocking.tests \
 	tests/ligature-id.tests \
+	tests/mark-filtering-sets.tests \
 	tests/mongolian-variation-selector.tests \
 	tests/spaces.tests \
 	tests/simple.tests \
diff --git a/test/shaping/fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf b/test/shaping/fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf
new file mode 100644
index 0000000..1dbadde
Binary files /dev/null and b/test/shaping/fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf differ
diff --git a/test/shaping/tests/mark-filtering-sets.tests b/test/shaping/tests/mark-filtering-sets.tests
new file mode 100644
index 0000000..7b5c910
--- /dev/null
+++ b/test/shaping/tests/mark-filtering-sets.tests
@@ -0,0 +1,5 @@
+fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf::U+062A,U+062E,U+062A,U+0629:[glyph837=3 at 299,1170+0|uni06C1.1=3+502|glyph837=2 at 149,690+0|uni0628.8=2+532|glyph836=1 at -51,1259+0|glyph514=1+196|glyph837=0 at 655,1751+0|glyph112=0 at 0,-358+905]
+fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf::U+062A,U+062E,U+0646,U+0629:[glyph837=3 at 299,1170+0|uni06C1.1=3+502|glyph836=2 at 149,690+0|uni0628.8=2+532|glyph836=1 at -51,1259+0|glyph514=1+196|glyph837=0 at 655,1751+0|glyph112=0 at 0,-358+905]
+fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf::U+062A,U+062E,U+0626,U+0629:[glyph837=3 at 299,1170+0|uni06C1.1=3+502|glyph847=2 at 149,690+0|uni0628.8=2+532|glyph836=1 at -51,1259+0|glyph514=1+196|glyph837=0 at 655,1751+0|glyph112=0 at 0,-358+905]
+fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf::U+062A,U+062E,U+062B,U+0629:[glyph837=3 at 299,1520+0|uni06C1.1=3+502|glyph838=2 at 149,690+0|uni0628.8=2+532|glyph836=1 at -51,1259+0|glyph514=1+196|glyph837=0 at 655,1751+0|glyph112=0 at 0,-358+905]
+fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf::U+062A,U+062E,U+0679,U+0629:[glyph837=3 at 299,1520+0|uni06C1.1=3+502|glyph842=2 at 149,690+0|uni0628.8=2+532|glyph836=1 at -51,1259+0|glyph514=1+196|glyph837=0 at 655,1751+0|glyph112=0 at 0,-358+905]