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
6 changes: 4 additions & 2 deletions ports/harfbuzz/harfbuzzConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ if(APPLE)
endif()
endif()

find_dependency(freetype CONFIG)
target_link_libraries(harfbuzz INTERFACE freetype)
if ("freetype" IN_LIST HARFBUZZ_FEATURES)
find_dependency(freetype CONFIG)
target_link_libraries(harfbuzz INTERFACE freetype)
endif()

if ("graphite2" IN_LIST HARFBUZZ_FEATURES)
find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
Expand Down
15 changes: 0 additions & 15 deletions ports/harfbuzz/ignore-unused-template.patch

This file was deleted.

3 changes: 1 addition & 2 deletions ports/harfbuzz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO harfbuzz/harfbuzz
REF ${VERSION}
SHA512 b7642a81eb021bf96cf8c91c5ebdde7f4fdfd40c76db722f00cf001125f4b81b954d08485774d2b23318d49b1e954fa0189ba8f10db56d148f33f9d90891d0cb
SHA512 f45dc18c5c0e3a6f67eaa7e87548dc30d7d7b2582f72f8e7f5ad486149414774979e332fd02122a1b6dd146532812d672b287029c637e0e411db072d7f73afb9
HEAD_REF master
PATCHES
${ANDROID_LOCALECONV_L_PATCH}
ignore-unused-template.patch
no-threads-on-emscripten.patch
)

Expand Down
5 changes: 2 additions & 3 deletions ports/harfbuzz/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "harfbuzz",
"version": "14.2.1",
"port-version": 2,
"version": "14.3.0",
"description": "HarfBuzz OpenType text shaping engine",
"homepage": "https://github.com/harfbuzz/harfbuzz",
"license": "MIT-Modern-Variant",
"license": "MIT-Modern-Variant AND MIT",
"supports": "!uwp",
"dependencies": [
{
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3777,8 +3777,8 @@
"port-version": 0
},
"harfbuzz": {
"baseline": "14.2.1",
"port-version": 2
"baseline": "14.3.0",
"port-version": 0
},
"hash-library": {
"baseline": "8",
Expand Down
5 changes: 5 additions & 0 deletions versions/h-/harfbuzz.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a45b1f381e472e6a3a1e776abda4cdd6a27f8c71",
"version": "14.3.0",
"port-version": 0
},
{
"git-tree": "188c03384ce4faae17bb567193eb079117ecac76",
"version": "14.2.1",
Expand Down
Loading