[harfbuzz] Make 'cairo' an optional feature for 'harfbuzz' (#34476)

* make 'cairo' an optional feature for 'harfbuzz' * regenerate versions * add 'defaulti-features : false' for feature 'cairo' * regenerate versions * add 'freetype' as a feature for feature 'cairo' * regenerate versions
microsoft · Oct 18, 2023 · 9cdd988 · 9cdd988
1 parent d003708
commit 9cdd988
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
@@ -30,6 +30,11 @@ else()
     list(APPEND FEATURE_OPTIONS -Dglib=disabled)
     list(APPEND FEATURE_OPTIONS -Dgobject=disabled)
 endif()
+if("cairo" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dcairo=enabled) # Enable Cairo graphics library support
+else()
+    list(APPEND FEATURE_OPTIONS -Dcairo=disabled)
+endif()
 list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers
 #if(VCPKG_TARGET_IS_WINDOWS)
     #link errors in qt5-base. probably requires changes to the pc files generated by meson
@@ -53,7 +58,6 @@ vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -Dcairo=disabled # Use Cairo graphics library
         -Ddocs=disabled          # Generate documentation with gtk-doc
         -Dtests=disabled
         -Dbenchmark=disabled

diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "harfbuzz",
   "version": "8.2.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",
@@ -21,6 +21,18 @@
     }
   ],
   "features": {
+    "cairo": {
+      "description": "Enable Cairo graphics library support",
+      "dependencies": [
+        {
+          "name": "cairo",
+          "default-features": false,
+          "features": [
+            "freetype"
+          ]
+        }
+      ]
+    },
     "coretext": {
       "description": "Enable CoreText shaper backend on macOS",
       "supports": "osx"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3202,7 +3202,7 @@
     },
     "harfbuzz": {
       "baseline": "8.2.1",
-      "port-version": 1
+      "port-version": 2
     },
     "hash-library": {
       "baseline": "8",

diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d6359755bd398188b67a216f7627e9f297f47889",
+      "version": "8.2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415",
       "version": "8.2.1",