[harfbuzz]Upgrade version to 2.5.1 and fix patches. (#6761)

5 files changed, 35 insertions, 32 deletions

diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch
index 0ba0245d0..c3264dfd5 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

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -795,7 +795,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)

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 019e205..8a464a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -795,7 +795,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)
diff --git a/ports/harfbuzz/0003-remove-broken-test.patch b/ports/harfbuzz/0003-remove-broken-test.patch
index 2e5b78fa7..2a3b234ee 100644
--- a/ports/harfbuzz/0003-remove-broken-test.patch
+++ b/ports/harfbuzz/0003-remove-broken-test.patch
@@ -1,6 +1,8 @@
+diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
+index 85993d1..3e8e642 100644
 --- a/src/hb-coretext.cc
 +++ b/src/hb-coretext.cc
-@@ -1059,20 +1059,6 @@
+@@ -1059,21 +1059,6 @@ resize_and_retry:
        buffer->len += num_glyphs;
      }
  
@@ -14,10 +16,11 @@
 -    if (false)
 -    {
 -      /* Make sure all runs had the expected direction. */
--      bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+-      HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
 -      assert (bool (status_and & kCTRunStatusRightToLeft) == backward);
 -      assert (bool (status_or  & kCTRunStatusRightToLeft) == backward);
 -    }
- 
+-
      buffer->clear_positions ();
  
+     unsigned int count = buffer->len;
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index a0fdfdd95..133d0bc0e 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 2.4.0
+Version: 2.5.1
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch
index 85dbbdeec..608e9c890 100644
--- a/ports/harfbuzz/find-package-freetype-2.patch
+++ b/ports/harfbuzz/find-package-freetype-2.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index defd5d6..03f9d4e 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -267,7 +267,7 @@ set (subset_project_headers

- 

- ## Find and include needed header folders and libraries

- if (HB_HAVE_FREETYPE)

--  include (FindFreetype)

-+  find_package(Freetype REQUIRED)

-   if (NOT FREETYPE_FOUND)

-     message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")

-   endif ()

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index defd5d6..03f9d4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -267,7 +267,7 @@ set (subset_project_headers
+ 
+ ## Find and include needed header folders and libraries
+ if (HB_HAVE_FREETYPE)
+-  include (FindFreetype)
++  find_package(Freetype REQUIRED)
+   if (NOT FREETYPE_FOUND)
+     message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")
+   endif ()
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index bfcd3cea0..d28bd656f 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 harfbuzz/harfbuzz
-    REF 2.4.0
-    SHA512 dd3a5caec689cffdd887bd3ca646ceaee804a0501d1d4ad1e9d9d48d9e4a87a02b76a9aa354dc69528b7d2a17c2431fce67c1681c72ad8246c2f5a1be498d52a
+    REF 2.5.1
+    SHA512 e8b4b98e65d809579456551e4dd70bdd847d02cbfa80df479f6f544eff2bdbfaa7502f22e5f4e5217f063badc8874f6e568d49e9c40ab752b233fafa9e74aeab
     HEAD_REF master
     PATCHES
         0001-fix-cmake-export.patch