|
| 1 | +diff -uPNr harfbuzz-11.2.0.orig/meson.build harfbuzz-11.2.0/meson.build |
| 2 | +--- harfbuzz-11.2.0.orig/meson.build 2025-04-28 08:56:32.000000000 -0400 |
| 3 | ++++ harfbuzz-11.2.0/meson.build 2025-05-03 03:25:39.602646412 -0400 |
| 4 | +@@ -115,31 +115,7 @@ |
| 5 | + # Sadly, FreeType's versioning schemes are different between pkg-config and CMake |
| 6 | + |
| 7 | + # Try pkg-config name |
| 8 | +- freetype_dep = dependency('freetype2', |
| 9 | +- version: freetype_min_version, |
| 10 | +- method: 'pkg-config', |
| 11 | +- required: false, |
| 12 | +- allow_fallback: false) |
| 13 | +- if not freetype_dep.found() |
| 14 | +- # Try cmake name |
| 15 | +- freetype_dep = dependency('Freetype', |
| 16 | +- version: freetype_min_version_actual, |
| 17 | +- method: 'cmake', |
| 18 | +- required: false, |
| 19 | +- allow_fallback: false) |
| 20 | +- # Subproject fallback |
| 21 | +- if not freetype_dep.found() |
| 22 | +- freetype_proj = subproject('freetype2', |
| 23 | +- version: freetype_min_version_actual, |
| 24 | +- required: get_option('freetype'), |
| 25 | +- default_options: ['harfbuzz=disabled']) |
| 26 | +- if freetype_proj.found() |
| 27 | +- freetype_dep = freetype_proj.get_variable('freetype_dep') |
| 28 | +- else |
| 29 | +- freetype_dep = dependency('', required: false) |
| 30 | +- endif |
| 31 | +- endif |
| 32 | +- endif |
| 33 | ++ freetype_dep = dependency('freetype2', version: freetype_min_version) |
| 34 | + endif |
| 35 | + |
| 36 | + glib_dep = dependency('glib-2.0', version: glib_min_version, required: get_option('glib')) |
0 commit comments