From c69a7ef33dae30616842e219a5572cb5852329d6 Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 22 Mar 2018 16:42:36 -0300 Subject: [PATCH] Update freetype and harfbuzz --- third_party/freetype2 | 2 +- third_party/harfbuzz | 2 +- third_party/harfbuzz-cmake/CMakeLists.txt | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/third_party/freetype2 b/third_party/freetype2 index 8529e84fb..af89e445f 160000 --- a/third_party/freetype2 +++ b/third_party/freetype2 @@ -1 +1 @@ -Subproject commit 8529e84fb4bb22abfc5c4d9cafbb06025a8b909d +Subproject commit af89e445f8c44f133362e840553194a2144ab0d5 diff --git a/third_party/harfbuzz b/third_party/harfbuzz index 681b0bc37..ec3bd67cb 160000 --- a/third_party/harfbuzz +++ b/third_party/harfbuzz @@ -1 +1 @@ -Subproject commit 681b0bc37b454cd24e7b71c1dc413521d1a44a0e +Subproject commit ec3bd67cb96bd2cc26d64dfc84926d5de0f600ce diff --git a/third_party/harfbuzz-cmake/CMakeLists.txt b/third_party/harfbuzz-cmake/CMakeLists.txt index 7b8cd5fef..0766aacb3 100644 --- a/third_party/harfbuzz-cmake/CMakeLists.txt +++ b/third_party/harfbuzz-cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2017 by David Capello +# Copyright (C) 2017-2018 by David Capello set(USE_UCDN 1) set(USE_ICU 0) @@ -34,6 +34,7 @@ if(UNIX AND NOT APPLE) endif() add_library(harfbuzz + ../harfbuzz/src/hb-aat-layout.cc ../harfbuzz/src/hb-blob.cc ../harfbuzz/src/hb-buffer-serialize.cc ../harfbuzz/src/hb-buffer.cc @@ -41,6 +42,7 @@ add_library(harfbuzz ../harfbuzz/src/hb-face.cc ../harfbuzz/src/hb-font.cc ../harfbuzz/src/hb-ft.cc + ../harfbuzz/src/hb-ot-color.cc ../harfbuzz/src/hb-ot-font.cc ../harfbuzz/src/hb-ot-layout.cc ../harfbuzz/src/hb-ot-map.cc @@ -51,6 +53,7 @@ add_library(harfbuzz ../harfbuzz/src/hb-ot-shape-complex-hebrew.cc ../harfbuzz/src/hb-ot-shape-complex-indic-table.cc ../harfbuzz/src/hb-ot-shape-complex-indic.cc + ../harfbuzz/src/hb-ot-shape-complex-khmer.cc ../harfbuzz/src/hb-ot-shape-complex-myanmar.cc ../harfbuzz/src/hb-ot-shape-complex-thai.cc ../harfbuzz/src/hb-ot-shape-complex-tibetan.cc @@ -65,6 +68,10 @@ add_library(harfbuzz ../harfbuzz/src/hb-shape-plan.cc ../harfbuzz/src/hb-shape.cc ../harfbuzz/src/hb-shaper.cc + ../harfbuzz/src/hb-subset-glyf.cc + ../harfbuzz/src/hb-subset-input.cc + ../harfbuzz/src/hb-subset-plan.cc + ../harfbuzz/src/hb-subset.cc ../harfbuzz/src/hb-unicode.cc ../harfbuzz/src/hb-warning.cc ${HARFBUZZ_EXTRA_SOURCES})