diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
| commit | 773c8267dfb506f41c204f61042f30b6143a8095 (patch) | |
| tree | 5946d1526c3ad77a2df80786a1370d96389d931b /ports/harfbuzz | |
| parent | 6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff) | |
| parent | 7859944528be28bee1fda9f325b78d6a7f02124e (diff) | |
| download | vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
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/glib-cmake.patch | 6 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 1 |
4 files changed, 28 insertions, 4 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 f3c58ee6e..fccb549ff 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,7 +1,7 @@ Source: harfbuzz -Version: 1.8.4-2 +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/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) 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") |