Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/harfbuzz/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: harfbuzz
Version: 2.7.2
Port-Version: 1
Description: HarfBuzz OpenType text shaping engine
Homepage: https://github.com/behdad/harfbuzz
Build-Depends: freetype[core], ragel, gettext (osx)
Expand Down
27 changes: 27 additions & 0 deletions ports/harfbuzz/icu.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb6cc9007..209128695 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,19 +226,13 @@ if (HB_HAVE_ICU)
add_definitions(-DHAVE_ICU)

# https://github.com/WebKit/webkit/blob/master/Source/cmake/FindICU.cmake
- find_package(PkgConfig)
- pkg_check_modules(PC_ICU QUIET icu-uc)
-
- find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR})
- find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR})
+ find_package(ICU COMPONENTS uc REQUIRED)

- include_directories(${ICU_INCLUDE_DIR})
+ include_directories(${ICU_INCLUDE_DIRS})

list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h)

- list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY})
-
- mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY)
+ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES})
endif ()

if (APPLE AND HB_HAVE_CORETEXT)
1 change: 1 addition & 0 deletions ports/harfbuzz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ vcpkg_from_github(
# This patch is required for propagating the full list of dependencies from glib
glib-cmake.patch
fix_include.patch
icu.patch
)

file(READ ${SOURCE_PATH}/CMakeLists.txt _contents)
Expand Down