From 4b5b820053373f198b5603606aec33ac250da5f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:45:46 +0200 Subject: [PATCH] [harfbuzz] update to 5.0.1 (#25961) * [harfbuzz] update to 5.0.1 * v db --- ports/harfbuzz/fix-win32-build.patch | 13 +++++++++++++ ports/harfbuzz/portfile.cmake | 6 ++++-- ports/harfbuzz/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/harfbuzz/fix-win32-build.patch diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch new file mode 100644 index 0000000000..e4ad0003ed --- /dev/null +++ b/ports/harfbuzz/fix-win32-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index e336037a2..a7c501b78 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -473,7 +473,7 @@ defs_list = [harfbuzz_def] + version = '0.@0@.0'.format(hb_version_int) + + extra_hb_cpp_args = [] +-if cpp.get_id() == 'msvc' ++if cpp.get_argument_syntax() == 'msvc' + if get_option('default_library') != 'static' + extra_hb_cpp_args += '-DHB_DLL_EXPORT' + endif diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 6e618698bb..4d44a10ad4 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 4.2.0 - SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38 + REF 5.0.1 + SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c HEAD_REF master + PATCHES + fix-win32-build.patch ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 948366a2fc..e6d8157889 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version": "4.2.0", - "port-version": 1, + "version": "5.0.1", "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 7aa62b8276..1ca453e385 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2781,8 +2781,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "4.2.0", - "port-version": 1 + "baseline": "5.0.1", + "port-version": 0 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7de0c7f954..e36e454087 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe57115dd9a78a72cbbaadf756e83bbbff449ed", + "version": "5.0.1", + "port-version": 0 + }, { "git-tree": "aa86b69179481aee3a47cb7452a7058a65e6da0c", "version": "4.2.0",