build: Add dependency fallbacks for libs with meson ports

With these changes gtk+ builds for me using fallbacks for all libraries
with fallbacks available. Needs the following changes:

https://github.com/ebassi/graphene/pull/109 (graphene)
https://bugzilla.gnome.org/show_bug.cgi?id=787414 (pango)
https://github.com/mesonbuild/meson/pull/2291 (will be in meson 0.42.1)

https://bugzilla.gnome.org/show_bug.cgi?id=787416
This commit is contained in:
Nirbheek Chauhan
2017-09-07 23:53:41 +05:30
parent 1a11d0071b
commit aa3e8ee097
6 changed files with 41 additions and 10 deletions

View File

@@ -156,6 +156,7 @@ gdk_deps = [
pango_dep, pango_dep,
cairogobj_dep, cairogobj_dep,
glib_dep, glib_dep,
gobject_dep,
epoxy_dep, epoxy_dep,
fontconfig_dep, fontconfig_dep,
giounix_dep, giounix_dep,

View File

@@ -814,6 +814,7 @@ gtk_deps = [
gmodule_dep, gmodule_dep,
giounix_dep, giounix_dep,
glib_dep, glib_dep,
gobject_dep,
atkbridge_dep, atkbridge_dep,
pangocairo_dep, pangocairo_dep,
pango_dep, pango_dep,

View File

@@ -3,7 +3,9 @@ project('gtk+-4.0', 'c',
default_options: [ default_options: [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'warning_level=1', 'warning_level=1',
'c_std=c99', # We only need c99, but glib needs GNU-specific features
# https://github.com/mesonbuild/meson/issues/2289
'c_std=gnu99',
], ],
meson_version : '>= 0.40.0', meson_version : '>= 0.40.0',
license: 'LGPLv2.1+') license: 'LGPLv2.1+')
@@ -313,18 +315,27 @@ gtkinc = include_directories('gtk')
testinc = include_directories('tests') testinc = include_directories('tests')
# Dependencies # Dependencies
glib_dep = dependency('glib-2.0', version: glib_req) glib_dep = dependency('glib-2.0', version: glib_req,
giounix_dep = dependency('gio-unix-2.0', version: glib_req, required: false) fallback : ['glib', 'libglib_dep'])
pango_dep = dependency('pango', version: pango_req) gobject_dep = dependency('gobject-2.0', version: glib_req,
pangoft_dep = dependency('pangoft2', required: wayland_enabled or x11_enabled) fallback : ['glib', 'libgobject_dep'])
giounix_dep = dependency('gio-unix-2.0', version: glib_req, required: false,
fallback : ['glib', 'libgio_dep'])
gmodule_dep = dependency('gmodule-2.0', version: glib_req,
fallback : ['glib', 'libgmodule_dep'])
cairo_dep = dependency('cairo', version: cairo_req) cairo_dep = dependency('cairo', version: cairo_req)
pangocairo_dep = dependency('pangocairo', version: cairo_req)
cairogobj_dep = dependency('cairo-gobject', version: cairo_req) cairogobj_dep = dependency('cairo-gobject', version: cairo_req)
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req) pango_dep = dependency('pango', version: pango_req,
fallback : ['pango', 'libpango_dep'])
pangoft_dep = dependency('pangoft2', required: wayland_enabled or x11_enabled,
fallback : ['pango', 'libpangoft2_dep'])
pangocairo_dep = dependency('pangocairo', version: cairo_req,
fallback : ['pango', 'libpangocairo_dep'])
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])
epoxy_dep = dependency('epoxy', version: epoxy_req, epoxy_dep = dependency('epoxy', version: epoxy_req,
fallback: ['libepoxy', 'libepoxy_dep']) fallback: ['libepoxy', 'libepoxy_dep'])
atk_dep = dependency('atk', version: atk_req) atk_dep = dependency('atk', version: atk_req)
gmodule_dep = dependency('gmodule-2.0', version: glib_req)
harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false) harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false)
xkbdep = dependency('xkbcommon', version: xkbcommon_req) xkbdep = dependency('xkbcommon', version: xkbcommon_req)
graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req,
@@ -483,8 +494,11 @@ if win32_enabled
backend_immodules += ['ime'] backend_immodules += ['ime']
endif endif
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in # Check for bind_textdomain_codeset, including -lintl if GLib brings it in by
if cc.has_function('bind_textdomain_codeset', dependencies: glib_dep) # doing the same check as glib. We can't check that by linking to glib because
# it might be a subproject and hence not built yet.
libintl_dep = cc.find_library('intl', required : false)
if cc.has_function('bind_textdomain_codeset', dependencies: libintl_dep)
cdata.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1) cdata.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1)
endif endif

View File

@@ -0,0 +1,5 @@
[wrap-git]
directory=gdk-pixbuf
url=https://git.gnome.org/browse/gdk-pixbuf
push-url=ssh://git.gnome.org/git/gdk-pixbuf
revision=origin/master

5
subprojects/glib.wrap Normal file
View File

@@ -0,0 +1,5 @@
[wrap-git]
directory=glib
url=https://git.gnome.org/browse/glib
push-url=ssh://git.gnome.org/git/glib
revision=origin/master

5
subprojects/pango.wrap Normal file
View File

@@ -0,0 +1,5 @@
[wrap-git]
directory=pango
url=https://git.gnome.org/browse/pango
push-url=ssh://git.gnome.org/git/pango
revision=origin/master