diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 6b7bb74ae8..eefcbdffb7 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -76,6 +76,13 @@ else() list(APPEND OPTIONS -Dintrospection=disabled) endif() +# This option switches the link language to C++, +# matching the C++ sources. This is necessary +# for android-dynamic and maybe more platforms. +if(VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS -Dwith_libstdcxx=true) +endif() + set(cxx_link_libraries "") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") block(PROPAGATE cxx_link_libraries) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 3332e9fa82..2a817e1d23 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "14.2.0", - "port-version": 2, + "port-version": 3, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 69df379387..9e3084e6f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "harfbuzz": { "baseline": "14.2.0", - "port-version": 2 + "port-version": 3 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 5e9090bc37..fbc097b0ac 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1f66bbbc19c8162fd706177182059b2e9c62002", + "version": "14.2.0", + "port-version": 3 + }, { "git-tree": "8a13874241340ff2488f3ed018cdc70b0c581679", "version": "14.2.0",