From a5d1b3a97ad322e7965667f2c26c9bbfe2341266 Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Mon, 22 Jun 2020 14:26:49 +0200
Subject: [PATCH] update to 2.6.8 (#46)

* update to 2.6.8

* fix expected results for message api (see harfbuzz/harfbuzz#2287)
---
 CMakeLists.txt          |  4 ++--
 tests/test_uharfbuzz.py | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1f7816..ce2f447 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(uharfbuzz_skbuild)
 
 include(ExternalProject)
 
-set(HARFBUZZ_VERSION "2.6.5")
-set(HARFBUZZ_SHA256 "126ea030bcb66fca518d43162443d337e60933c3729c23f8a25da3a1c7371dfd")
+set(HARFBUZZ_VERSION "2.6.8")
+set(HARFBUZZ_SHA256 "6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035")
 
 # download, configure, build and install harbfuzz static library
 ExternalProject_Add(
diff --git a/tests/test_uharfbuzz.py b/tests/test_uharfbuzz.py
index 1577592..d70c5a4 100644
--- a/tests/test_uharfbuzz.py
+++ b/tests/test_uharfbuzz.py
@@ -223,14 +223,25 @@ def message(msg):
         assert gids == [5, 4, 1, 2, 1]
         pos = [g.x_advance for g in buf.glyph_positions]
         assert pos == [0, 0, 0, 100, 0]
-        # messages: start GSUB lookup, end GSUB lookup, start GPOS lookup, end GPOS lookup
-        assert messages == ['start lookup 0', 'end lookup 0', 'start lookup 0', 'end lookup 0']
+        expected_messages = [
+            'start table GSUB',
+            'start lookup 0',
+            'end lookup 0',
+            'end table GSUB',
+            'start table GPOS',
+            'start lookup 0',
+            'end lookup 0',
+            'end table GPOS',
+        ]
+        assert messages == expected_messages
         gids_trace = [[g.codepoint for g in infos] for infos in infos_trace]
-        assert gids_trace == [[5, 4, 3, 2, 1], [5, 4, 1, 2, 1],
+        assert gids_trace == [[5, 4, 3, 2, 1], [5, 4, 3, 2, 1], [5, 4, 1, 2, 1],
+                              [5, 4, 1, 2, 1], [5, 4, 1, 2, 1], [5, 4, 1, 2, 1],
                               [5, 4, 1, 2, 1], [5, 4, 1, 2, 1]]
         advances_trace = [[g.x_advance for g in pos] for pos in positions_trace]
-        assert advances_trace == [[0, 0, 0, 0, 0], [0, 0, 0, 0, 0],
-                                  [0, 0, 0, 0, 0], [0, 0, 0, 100, 0]]
+        assert advances_trace == [[0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0],
+                                  [0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0],
+                                  [0, 0, 0, 100, 0], [0, 0, 0, 100, 0]]
 
     def test_message_func_crash(self, blankfont):
         string = "edcba"