diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-03-14 09:33:48 -0400 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-14 06:33:47 -0700 |
| commit | f409536f5e8119376ee65d1f25d278b36b7f8136 (patch) | |
| tree | fd6a05b4f658bfd9a25576052f4ddbbcc42f4731 /ports/harfbuzz | |
| parent | e37a6c65d6b8c126ba50caad70cc2a7f839a2275 (diff) | |
| download | vcpkg-f409536f5e8119376ee65d1f25d278b36b7f8136.tar.gz vcpkg-f409536f5e8119376ee65d1f25d278b36b7f8136.zip | |
[qt5] Fix mac build (#5624)
* [qt5] Fix mac build
* [qt5] Disable parallel build on mac
* [qt5] Fix qmake find on mac
* [qt5] Update find jom for mac
* [qt5] Fix invocation of build command
* [qt5-base] Rebuild packages for #5624
* [harfbuzz] Remove disabled assert (failing due to -Werror)
* [qt5] Bump control version
* [qt5] Disable harfbuzz on mac
* [qt5-base] Disable harfbuzz on mac
Diffstat (limited to 'ports/harfbuzz')
| -rw-r--r-- | ports/harfbuzz/0003-remove-broken-test.patch | 23 | ||||
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/ports/harfbuzz/0003-remove-broken-test.patch b/ports/harfbuzz/0003-remove-broken-test.patch new file mode 100644 index 000000000..2e5b78fa7 --- /dev/null +++ b/ports/harfbuzz/0003-remove-broken-test.patch @@ -0,0 +1,23 @@ +--- a/src/hb-coretext.cc ++++ b/src/hb-coretext.cc +@@ -1059,20 +1059,6 @@ + buffer->len += num_glyphs; + } + +- /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, +- * or if it does, it doesn't respect it. So we get runs with wrong +- * directions. As such, disable the assert... It wouldn't crash, but +- * cursoring will be off... +- * +- * https://crbug.com/419769 +- */ +- if (false) +- { +- /* Make sure all runs had the expected direction. */ +- bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); +- assert (bool (status_and & kCTRunStatusRightToLeft) == backward); +- assert (bool (status_or & kCTRunStatusRightToLeft) == backward); +- } + + buffer->clear_positions (); + diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 010118683..82751a0c3 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 2.3.1 +Version: 2.3.1-2 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel, gettext (osx) Default-Features: ucdn diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 40729c8f7..d538c27cd 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 0001-fix-cmake-export.patch 0002-fix-uwp-build.patch + 0003-remove-broken-test.patch ) SET(HB_HAVE_ICU "OFF") |