diff options
| author | Lennart Trunk <lennart.trunk@outlook.de> | 2019-03-12 21:54:20 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-12 13:54:20 -0700 |
| commit | 1d4485cec5b678b7bcecf2d5ea5839af858bf765 (patch) | |
| tree | f48e34130f9c8219f20e753c0affc8ea303a3f1c /ports/harfbuzz/glib-cmake.patch | |
| parent | f24bd414ceeed5f4faad80405b87da4394c02d63 (diff) | |
| download | vcpkg-1d4485cec5b678b7bcecf2d5ea5839af858bf765.tar.gz vcpkg-1d4485cec5b678b7bcecf2d5ea5839af858bf765.zip | |
[harfbuzz] update Harfbuzz to 2.3.1 (#5359)
* update harfbuzz to 2.2.0
* clean up port and fix portfile/patches
* update harfbuzz to 2.3.1
* fix uwp patch
* skip test building
Diffstat (limited to 'ports/harfbuzz/glib-cmake.patch')
| -rw-r--r-- | ports/harfbuzz/glib-cmake.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch deleted file mode 100644 index ddbc96712..000000000 --- a/ports/harfbuzz/glib-cmake.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d6e77e8..36e4b4e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -306,22 +306,14 @@ 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(Threads REQUIRED) -+ find_package(unofficial-iconv REQUIRED) -+ 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) |