mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
meson: Always fetch pangoft2_dep from the pango subproject
This ensures that we will use pangoft2 if it is available, and not if it is not available. See: https://gitlab.gnome.org/GNOME/pango/merge_requests/6
This commit is contained in:
parent
00c29e1fbe
commit
b98f5a0823
@ -327,12 +327,8 @@ pango_dep = dependency('pango', version: pango_req,
|
||||
|
||||
# Require PangoFT2 if on X11 or wayland
|
||||
require_pangoft2 = wayland_enabled or x11_enabled
|
||||
|
||||
if require_pangoft2
|
||||
pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
|
||||
else
|
||||
pangoft_dep = dependency('pangoft2', required: false)
|
||||
endif
|
||||
pangoft_dep = dependency('pangoft2', required: require_pangoft2,
|
||||
fallback : ['pango', 'libpangoft2_dep'])
|
||||
|
||||
if pangoft_dep.found()
|
||||
# Need at least 2.7.1 for FT_Get_Var_Design_Coordinates()
|
||||
|
Loading…
Reference in New Issue
Block a user