From b482b7d8af073fd43e3e0a1ba5cf40fce33c6c34 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 May 2020 10:52:38 -0400 Subject: Bump the pango dependency We soon want to rely on the list model apis in pango 1.45. This commit also fixes a mixup where using pango as a submodule would break the build when pangoft2 is required. --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 486ea08672..fc0b1ef7fc 100644 --- a/meson.build +++ b/meson.build @@ -27,7 +27,7 @@ else endif glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req) -pango_req = '>= 1.44.4' +pango_req = '>= 1.45.0' fribidi_req = '>= 0.19.7' atk_req = '>= 2.15.1' cairo_req = '>= 1.14.0' @@ -352,10 +352,11 @@ fribidi_dep = dependency('fribidi', version: fribidi_req, # Require PangoFT2 if on X11 or wayland require_pangoft2 = wayland_enabled or x11_enabled -pangoft_dep = dependency('pangoft2', required: false) if require_pangoft2 pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep']) +else + pangoft_dep = dependency('pangoft2', required: false) endif if win32_enabled -- cgit v1.2.1