[harfbuzz] Update to 4.2.0 (#24144)

* updated harfbuzz from 3.2.0 to 4.2.0 * updated version * Update ports/harfbuzz/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * updated version * Removed paths from library definitions in *.pc files in case of windows static build\nRemoved patches * version-semver -> version * Delete no longer applied patches. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Apr 28, 2022 · 0d71120 · 0d71120
1 parent 53b90be
commit 0d71120
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 132 deletions.
diff --git a/ports/harfbuzz/0001-circumvent-samefile-error.patch b/ports/harfbuzz/0001-circumvent-samefile-error.patch
diff --git a/ports/harfbuzz/0002-fix-uwp-build.patch b/ports/harfbuzz/0002-fix-uwp-build.patch
diff --git a/ports/harfbuzz/fix-macos-build.diff b/ports/harfbuzz/fix-macos-build.diff
diff --git a/ports/harfbuzz/fix-mingw-build.patch b/ports/harfbuzz/fix-mingw-build.patch
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
@@ -1,18 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 3.2.0
-    SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
+    REF 4.2.0
+    SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38
     HEAD_REF master
-    PATCHES
-        # This patch is a workaround that is needed until the following issues are resolved upstream:
-        # - https://github.com/mesonbuild/meson/issues/8375
-        # - https://github.com/harfbuzz/harfbuzz/issues/2870
-        # Details: https://github.com/microsoft/vcpkg/issues/16262
-        0001-circumvent-samefile-error.patch
-        0002-fix-uwp-build.patch
-        fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484
-        fix-mingw-build.patch # https://github.com/harfbuzz/harfbuzz/pull/3385
 )
 
 if("icu" IN_LIST FEATURES)
@@ -65,6 +56,21 @@ vcpkg_install_meson()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+	file(GLOB PC_FILES 
+		"${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc" 
+		"${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
+
+	foreach(PC_FILE IN LISTS PC_FILES)
+		file(READ "${PC_FILE}" PC_FILE_CONTENT)
+		string(REGEX REPLACE 
+			"\\$\\{prefix\}\\/lib\\/([a-zA-Z0-9\-]*)\\.lib" 
+			"-l\\1" PC_FILE_CONTENT 
+			"${PC_FILE_CONTENT}")
+		file(WRITE "${PC_FILE}" ${PC_FILE_CONTENT})
+	endforeach()
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in"

diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "harfbuzz",
-  "version-semver": "3.2.0",
-  "port-version": 3,
+  "version": "4.2.0",
   "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
@@ -2721,8 +2721,8 @@
       "port-version": 0
     },
     "harfbuzz": {
-      "baseline": "3.2.0",
-      "port-version": 3
+      "baseline": "4.2.0",
+      "port-version": 0
     },
     "hash-library": {
       "baseline": "8",

diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "02ad2865be7815604bb2c0e6cbc368f3d23d93d6",
+      "version": "4.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797",
       "version-semver": "3.2.0",