diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-30 11:13:55 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-30 11:13:55 -0400 |
| commit | 5235a4c48a597bb9ad58871dfd7d37064b7a1c0e (patch) | |
| tree | d6328eabdb40ad138d2f6031d4bcd89f874463f3 /meson.build | |
| parent | fd73f8d972550d6dc13abbeb03b81eff906c056f (diff) | |
| download | gtk+-5235a4c48a597bb9ad58871dfd7d37064b7a1c0e.tar.gz | |
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.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files 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']) |