diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
| commit | 7a67785e14130170679d19be832f2e1ba2530560 (patch) | |
| tree | 49196cc5252f2e800a18802548006977da276447 /ports/harfbuzz | |
| parent | 524a1414fc395fdc60951d63f4a66683309fd630 (diff) | |
| parent | b2996e1fd48842446a64443d057c576f819bda00 (diff) | |
| download | vcpkg-7a67785e14130170679d19be832f2e1ba2530560.tar.gz vcpkg-7a67785e14130170679d19be832f2e1ba2530560.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/roschuma/4988
Diffstat (limited to 'ports/harfbuzz')
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/glib-cmake.patch | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index f3c58ee6e..32d70f5ec 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 1.8.4-2 +Version: 1.8.4-3 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel Default-Features: ucdn diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch index cdd7f48a6..ddbc96712 100644 --- a/ports/harfbuzz/glib-cmake.patch +++ b/ports/harfbuzz/glib-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c52731..8305f27 100644 +index 2d6e77e8..36e4b4e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -314,22 +314,12 @@ endif () +@@ -306,22 +306,14 @@ endif () if (HB_HAVE_GLIB) add_definitions(-DHAVE_GLIB) @@ -15,6 +15,8 @@ index 3c52731..8305f27 100644 - find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) - - include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) ++ find_package(Threads REQUIRED) ++ find_package(unofficial-iconv REQUIRED) + find_package(unofficial-glib CONFIG REQUIRED) list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) |