diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
| commit | 2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch) | |
| tree | 3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/harfbuzz | |
| parent | 3830517ec7519b823f5d8c404710889c6bd00278 (diff) | |
| parent | 2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff) | |
| download | vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/harfbuzz')
| -rw-r--r-- | ports/harfbuzz/0002-fix-macos-build.patch | 21 | ||||
| -rw-r--r-- | ports/harfbuzz/CONTROL | 4 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 1 |
3 files changed, 24 insertions, 2 deletions
diff --git a/ports/harfbuzz/0002-fix-macos-build.patch b/ports/harfbuzz/0002-fix-macos-build.patch new file mode 100644 index 000000000..3b32092c1 --- /dev/null +++ b/ports/harfbuzz/0002-fix-macos-build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c613e0..32d3a29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.0)
++cmake_minimum_required(VERSION 3.5.0)
+ project(harfbuzz)
+
+ enable_testing()
+@@ -316,6 +316,10 @@ if (HB_HAVE_GLIB)
+
+ find_package(Threads REQUIRED)
+ find_package(unofficial-iconv REQUIRED)
++ if(APPLE)
++ find_package(unofficial-gettext CONFIG REQUIRED)
++ list(APPEND THIRD_PARTY_LIBS unofficial::gettext::libintl)
++ endif()
+ find_package(unofficial-glib CONFIG REQUIRED)
+
+ list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc)
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 32d70f5ec..fccb549ff 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,7 +1,7 @@ Source: harfbuzz -Version: 1.8.4-3 +Version: 1.8.4-4 Description: HarfBuzz OpenType text shaping engine -Build-Depends: freetype, ragel +Build-Depends: freetype, ragel, gettext (osx) Default-Features: ucdn Feature: graphite2 diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 382b045e1..d1455e5dc 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( find-package-freetype-2.patch glib-cmake.patch 0001-fix-cmake-export.patch + 0002-fix-macos-build.patch ) SET(HB_HAVE_ICU "OFF") |