aboutsummaryrefslogtreecommitdiff
path: root/ports/harfbuzz
diff options
context:
space:
mode:
Diffstat (limited to 'ports/harfbuzz')
-rw-r--r--ports/harfbuzz/CONTROL2
-rw-r--r--ports/harfbuzz/find-package-freetype-2.patch (renamed from ports/harfbuzz/find-package-freetype.patch)26
-rw-r--r--ports/harfbuzz/portfile.cmake4
3 files changed, 16 insertions, 16 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index f03f52187..e6cf6a8e5 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,4 +1,4 @@
Source: harfbuzz
-Version: 1.7.6
+Version: 1.7.6-1
Description: HarfBuzz OpenType text shaping engine
Build-Depends: freetype, ragel, glib (windows)
diff --git a/ports/harfbuzz/find-package-freetype.patch b/ports/harfbuzz/find-package-freetype-2.patch
index a556d1377..85dbbdeec 100644
--- a/ports/harfbuzz/find-package-freetype.patch
+++ b/ports/harfbuzz/find-package-freetype-2.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 24ccb6f..21df836 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -201,7 +201,7 @@ set(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 b1c91aa91..906e42d95 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -12,10 +12,10 @@ vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch"
- "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype.patch"
+ "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch"
)
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_CMAKE_SYSTEM_NAME)
SET(HAVE_GLIB "OFF")
SET(BUILTIN_UCDN "ON")
else()