From 5235a4c48a597bb9ad58871dfd7d37064b7a1c0e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 30 May 2020 11:13:55 -0400 Subject: [PATCH] Fix inconsistencies in our pango deps We were applying the pango version requirements inconsistently, leading to different pango variables being taking from system pango vs the subproject at times. Thankfully, meson detects this and complains, so we can fix it. --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index fc0b1ef7fc..912c0f8a95 100644 --- a/meson.build +++ b/meson.build @@ -354,7 +354,8 @@ fribidi_dep = dependency('fribidi', version: fribidi_req, require_pangoft2 = wayland_enabled or x11_enabled if require_pangoft2 - pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep']) + pangoft_dep = dependency('pangoft2', version: pango_req, + fallback : ['pango', 'libpangoft2_dep']) else pangoft_dep = dependency('pangoft2', required: false) endif @@ -364,7 +365,7 @@ if win32_enabled pangowin32_dep = dependency('pangowin32') endif -pangocairo_dep = dependency('pangocairo', version: cairo_req, +pangocairo_dep = dependency('pangocairo', version: pango_req, fallback : ['pango', 'libpangocairo_dep']) pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])