diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-27 14:00:17 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alex@karatarakis.com> | 2017-10-27 14:11:00 -0700 |
| commit | 80953867e88f88ca65e0e6d4ddc69009ee11a038 (patch) | |
| tree | f2afba2760bc9838dd2a83b441421220684d9c97 | |
| parent | eb6860b193876e00dae02e4115f94e50d48a2a9d (diff) | |
| download | vcpkg-80953867e88f88ca65e0e6d4ddc69009ee11a038.tar.gz vcpkg-80953867e88f88ca65e0e6d4ddc69009ee11a038.zip | |
[harfbuzz] Fix patch and apply it relative to SOURCE_PATH
The latter is done so it doesn't have to be modified if only the version is changed
| -rw-r--r-- | ports/harfbuzz/0001-fix-uwp-build.patch | 10 | ||||
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ports/harfbuzz/0001-fix-uwp-build.patch b/ports/harfbuzz/0001-fix-uwp-build.patch index 8605d5a93..24b5bf894 100644 --- a/ports/harfbuzz/0001-fix-uwp-build.patch +++ b/ports/harfbuzz/0001-fix-uwp-build.patch @@ -1,7 +1,7 @@ -diff --git "a/harfbuzz-1.6.3/src/hb-ft.cc" "b/harfbuzz-1.6.3/src/hb-ft.cc" -index 48d6a0ef..f4ce6608 100644 ---- "a/harfbuzz-1.6.3/src/hb-ft.cc" -+++ "b/harfbuzz-1.6.3/src/hb-ft.cc" +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index f578e9d..f224c07 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc @@ -31,6 +31,10 @@ #include "hb-ft.h" @@ -12,4 +12,4 @@ index 48d6a0ef..f4ce6608 100644 + #include "hb-font-private.hh" - #include "hb-cache-private.hh" // Maybe use in the future? + #include FT_ADVANCES_H diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 961d59291..9dad59be5 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,4 +1,4 @@ Source: harfbuzz -Version: 1.6.3 +Version: 1.6.3-1 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, glib (windows) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 3b951dcdf..f9fa05555 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ + SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch" ) |