mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-17 23:50:16 +00:00
Merge branch 'fix-pango-deps' into 'master'
Fix inconsistencies in our pango deps See merge request GNOME/gtk!1989
This commit is contained in:
commit
415bfeb950
@ -354,7 +354,8 @@ fribidi_dep = dependency('fribidi', version: fribidi_req,
|
|||||||
require_pangoft2 = wayland_enabled or x11_enabled
|
require_pangoft2 = wayland_enabled or x11_enabled
|
||||||
|
|
||||||
if require_pangoft2
|
if require_pangoft2
|
||||||
pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
|
pangoft_dep = dependency('pangoft2', version: pango_req,
|
||||||
|
fallback : ['pango', 'libpangoft2_dep'])
|
||||||
else
|
else
|
||||||
pangoft_dep = dependency('pangoft2', required: false)
|
pangoft_dep = dependency('pangoft2', required: false)
|
||||||
endif
|
endif
|
||||||
@ -364,7 +365,7 @@ if win32_enabled
|
|||||||
pangowin32_dep = dependency('pangowin32')
|
pangowin32_dep = dependency('pangowin32')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pangocairo_dep = dependency('pangocairo', version: cairo_req,
|
pangocairo_dep = dependency('pangocairo', version: pango_req,
|
||||||
fallback : ['pango', 'libpangocairo_dep'])
|
fallback : ['pango', 'libpangocairo_dep'])
|
||||||
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
|
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
|
||||||
fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])
|
fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])
|
||||||
|
Loading…
Reference in New Issue
Block a user