Enable HarfBuzz support in bundled FreeType

QuLogic · QuLogic · commit 9619bcc8ab1c · 2026-02-05T16:19:16.000-05:00
Due to the circular dependency between FreeType and HarfBuzz, this
requires a small patch to make FreeType not look for HarfBuzz, allowing
it to come from the superproject linkage. While FreeType does support
dynamically loading HarfBuzz, this should be a bit safer at avoiding any
chance of mixing system with bundled libraries.
diff --git a/extern/meson.build b/extern/meson.build
@@ -15,7 +15,7 @@ else
       'default_library=static',
       'brotli=disabled',
       'bzip2=disabled',
-      'harfbuzz=disabled',
+      get_option('system-libraqm') ? 'harfbuzz=disabled' : 'harfbuzz=static',
       'mmap=auto',
       'png=disabled',
       'tests=disabled',
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
@@ -8,6 +8,9 @@ source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetyp
 source_filename = freetype-2.14.1.tar.xz
 source_hash = 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc
 
+# This patch allows using our bundled HarfBuzz.
+diff_files = freetype-2.14.1-static-harfbuzz.patch
+
 [provide]
 freetype2 = freetype_dep
 freetype = freetype_dep
diff --git a/subprojects/packagefiles/freetype-2.14.1-static-harfbuzz.patch b/subprojects/packagefiles/freetype-2.14.1-static-harfbuzz.patch
@@ -0,0 +1,29 @@
+diff -uPNr freetype-2.14.1.orig/meson.build freetype-2.14.1/meson.build
+--- freetype-2.14.1.orig/meson.build	2025-09-11 07:12:24.000000000 -0400
++++ freetype-2.14.1/meson.build	2026-01-04 15:49:14.198061441 -0500
+@@ -364,6 +364,13 @@
+   endif
+ endif
+ 
++if harfbuzz_opt == 'static'
++  harfbuzz_dep = declare_dependency()
++  harfbuzz_opt = 'YES'
++  ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
++  ft2_deps += [harfbuzz_dep]
++endif
++
+ if not harfbuzz_dep.found() and \
+    (harfbuzz_opt == 'dynamic' or harfbuzz_opt == 'auto')
+   # On Windows we don't need libdl, but on other platforms we need it.
+diff -uPNr freetype-2.14.1.orig/meson_options.txt freetype-2.14.1/meson_options.txt
+--- freetype-2.14.1.orig/meson_options.txt	2025-09-07 22:48:18.000000000 -0400
++++ freetype-2.14.1/meson_options.txt	2026-01-04 15:49:30.087034418 -0500
+@@ -24,7 +24,7 @@
+ 
+ option('harfbuzz',
+   type: 'combo',
+-  choices: ['auto', 'enabled', 'dynamic', 'disabled'],
++  choices: ['auto', 'enabled', 'dynamic', 'static', 'disabled'],
+   value: 'auto',
+   description: 'Use Harfbuzz library to improve auto-hinting;'
+                + ' if available, many glyphs not directly addressable'
