From a07107bacd1e54a0e69b05a30f4fd01cc4e936c2 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Thu, 12 Nov 2020 19:23:11 +0100
Subject: [PATCH] [harfbuzz] fix icu linkage (#14530)

---
 ports/harfbuzz/CONTROL        |  1 +
 ports/harfbuzz/icu.patch      | 27 +++++++++++++++++++++++++++
 ports/harfbuzz/portfile.cmake |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 ports/harfbuzz/icu.patch

diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 050580cea42..753eb70b9e1 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -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)
diff --git a/ports/harfbuzz/icu.patch b/ports/harfbuzz/icu.patch
new file mode 100644
index 00000000000..1747c4a7df2
--- /dev/null
+++ b/ports/harfbuzz/icu.patch
@@ -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)
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 51200a23818..055adaa1551 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -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)