[harfbuzz,skia] Update and replace Skia dependencies with vcpkg (#11416)

4 files changed, 21 insertions, 57 deletions

diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch
index c3264dfd5..31f4896f4 100644
--- a/ports/harfbuzz/0001-fix-cmake-export.patch
+++ b/ports/harfbuzz/0001-fix-cmake-export.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 019e205..8a464a5 100644
+index 71830b6f5..a25cb09dd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -795,7 +795,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+@@ -712,7 +712,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
    )
    install(EXPORT harfbuzzConfig
        NAMESPACE harfbuzz::
 -      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz
 +      DESTINATION share/harfbuzz
    )
-   if (HB_BUILD_UTILS)
-     if (WIN32 AND BUILD_SHARED_LIBS)
+   if (HB_HAVE_ICU)
+     install(TARGETS harfbuzz-icu
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 04c85fb5c..4dbeebf7c 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,9 +1,8 @@
 Source: harfbuzz
-Version: 2.5.3-1
+Version: 2.6.6
 Description: HarfBuzz OpenType text shaping engine
 Homepage: https://github.com/behdad/harfbuzz
 Build-Depends: freetype[core], ragel, gettext (osx)
-Default-Features: ucdn
 
 Feature: graphite2
 Build-Depends: graphite2
@@ -13,9 +12,6 @@ Feature: icu
 Build-Depends: icu
 Description: icu support for harfbuzz
 
-Feature: ucdn
-Description: Builtin (UCDN) Unicode callbacks support
-
 Feature: glib
 Build-Depends: glib
 Description: Glib Unicode callbacks support
diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch
index ddbc96712..519627ac7 100644
--- a/ports/harfbuzz/glib-cmake.patch
+++ b/ports/harfbuzz/glib-cmake.patch
@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d6e77e8..36e4b4e6 100644
+index 9b21bef2c..ae741ef63 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -306,22 +306,14 @@ endif ()
+@@ -213,21 +213,13 @@ 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)
@@ -18,14 +18,13 @@ index 2d6e77e8..36e4b4e6 100644
 +  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)
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 98e6b15af..8e82f9d6e 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 2.5.3
-    SHA512 d541463b3647fc2c7ddaa29aedcea1c3bde5e26e0d529384d66d630af3aaf2a4befb3c4d47c93833f099339a0f951fb132011a02c57fc00ba543bd1b17026ffa
+    REF 2.6.6
+    SHA512 3ddf3e6eccf28ca1441544f0b67e243c6a85a32122bfc0f8092b3cc465b20a25aa3cb72404070d2627b9e204f86412c3bfb9aaca272c5492d8448facc1971a7d
     HEAD_REF master
     PATCHES
         0001-fix-cmake-export.patch
@@ -26,44 +24,17 @@ if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES")
     message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.")
 endif()
 
-SET(HB_HAVE_ICU "OFF")
-if("icu" IN_LIST FEATURES)
-    SET(HB_HAVE_ICU "ON")
-endif()
-
-SET(HB_HAVE_GRAPHITE2 "OFF")
-if("graphite2" IN_LIST FEATURES)
-    SET(HB_HAVE_GRAPHITE2 "ON")
-endif()
-
-## Unicode callbacks
-
-# Builtin (UCDN)
-set(BUILTIN_UCDN OFF)
-if("ucdn" IN_LIST FEATURES)
-    set(BUILTIN_UCDN ON)
-endif()
-
-# Glib
-set(HAVE_GLIB OFF)
-if("glib" IN_LIST FEATURES)
-    set(HAVE_GLIB ON)
-endif()
-
-# At least one Unicode callback must be specified, or harfbuzz compilation fails
-if(NOT (BUILTIN_UCDN OR HAVE_GLIB))
-    message(FATAL_ERROR "Error: At least one Unicode callback must be specified (ucdn, glib).")
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    icu         HB_HAVE_ICU
+    graphite2   HB_HAVE_GRAPHITE2
+    glib        HB_HAVE_GLIB
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         -DHB_HAVE_FREETYPE=ON
-        -DHB_BUILTIN_UCDN=${BUILTIN_UCDN}
-        -DHB_HAVE_ICU=${HB_HAVE_ICU}
-        -DHB_HAVE_GLIB=${HAVE_GLIB}
-        -DHB_HAVE_GRAPHITE2=${HB_HAVE_GRAPHITE2}
         -DHB_BUILD_TESTS=OFF
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
@@ -74,7 +45,7 @@ vcpkg_fixup_cmake_targets()
 
 vcpkg_copy_pdbs()
 
-if (HAVE_GLIB)
+if ("glib" IN_LIST FEATURES)
     # Propagate dependency on glib downstream
     file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents)
     file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" "
@@ -86,6 +57,4 @@ ${_contents}
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright)
-
-vcpkg_test_cmake(PACKAGE_NAME harfbuzz)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)