diff options
| author | Aybe <aybe@users.noreply.github.com> | 2018-08-08 21:15:47 +0200 |
|---|---|---|
| committer | Aybe <aybe@users.noreply.github.com> | 2018-08-08 21:15:47 +0200 |
| commit | 61820777517d669e00fbdeb2368e156b66396b51 (patch) | |
| tree | 57e0d31ff7b8fc3f85fd3bfe98148ef715149b6c /ports/harfbuzz | |
| parent | 8cfc78e890b18762f1f5d0aff346c397de2e6d56 (diff) | |
| parent | 13e19f10ea83985708320542cbf05217b4da9969 (diff) | |
| download | vcpkg-61820777517d669e00fbdeb2368e156b66396b51.tar.gz vcpkg-61820777517d669e00fbdeb2368e156b66396b51.zip | |
Merge branch 'master' into liblzma-uwp
Diffstat (limited to 'ports/harfbuzz')
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/glib-cmake.patch | 29 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index d503ca111..8eaa04edf 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 1.8.2-2 +Version: 1.8.4 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 new file mode 100644 index 000000000..cdd7f48a6 --- /dev/null +++ b/ports/harfbuzz/glib-cmake.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c52731..8305f27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,22 +314,12 @@ endif () + if (HB_HAVE_GLIB) + add_definitions(-DHAVE_GLIB) + +- # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake +- find_package(PkgConfig) +- pkg_check_modules(PC_GLIB QUIET glib-2.0) +- +- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) +- find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) +- 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(unofficial-glib CONFIG REQUIRED) + + list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) + +- list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) +- +- mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) ++ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib) + endif () + + if (HB_HAVE_ICU) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 728b26fdb..2c19a0d23 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO behdad/harfbuzz - REF 1.8.2 - SHA512 83a5126f17e57b05c36779f91ea9c2454731d7e6f514fce134ae5e652972a8231723773e0e0f64bfe8588f8cfcf2e041031a3328ee3102d440b2ac427aa1d764 + REF 1.8.4 + SHA512 92742b754713d1df8975d4d8467de04765784d7fd566b7e07e7e7a261b0338e997a5fc11fa4fe282d6d5540d242db40c993812fbc4a881becd95fd3aae598c80 HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch" "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch" + "${CMAKE_CURRENT_LIST_DIR}/glib-cmake.patch" ) SET(HB_HAVE_ICU "OFF") |