diff options
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 22a211c4fc..13fa35b560 100644 --- a/meson.build +++ b/meson.build @@ -29,7 +29,6 @@ endif glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req) pango_req = '>= 1.44.0' fribidi_req = '>= 0.19.7' -atk_req = '>= 2.15.1' cairo_req = '>= 1.14.0' gdk_pixbuf_req = '>= 2.30.0' introspection_req = '>= 1.39.0' @@ -307,6 +306,7 @@ endif confinc = include_directories('.') gdkinc = include_directories('gdk') gskinc = include_directories('gsk') +atkinc = include_directories('atk') gtkinc = include_directories('gtk') testinc = include_directories('tests') @@ -351,7 +351,6 @@ pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) epoxy_dep = dependency('epoxy', version: epoxy_req, fallback: ['libepoxy', 'libepoxy_dep']) -atk_dep = dependency('atk', version: atk_req) harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false) xkbdep = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled) graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, @@ -447,8 +446,6 @@ cdata.set('HAVE_CAIRO_SCRIPT_INTERPRETER', cairo_csi_dep.found()) cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found()) cdata.set('HAVE_PANGOFT', pangoft_dep.found()) -atk_pkgs = ['atk'] - wayland_pkgs = [] if wayland_enabled wlclientdep = dependency('wayland-client', version: wayland_req) @@ -479,7 +476,6 @@ if x11_enabled xfixes_dep = dependency('xfixes', required: false) xcomposite_dep = dependency('xcomposite', required: false) fontconfig_dep = dependency('fontconfig') - atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req) backend_immodules += ['xim'] @@ -498,8 +494,6 @@ if x11_enabled x11_pkgs += ['xdamage'] endif - atk_pkgs += ['atk-bridge-2.0'] - cdata.set('HAVE_XDAMAGE', xdamage_dep.found()) cdata.set('HAVE_XCURSOR', xcursor_dep.found()) cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found()) @@ -675,6 +669,7 @@ endif subdir('gtk/css') subdir('gdk') subdir('gsk') +subdir('atk') subdir('gtk') subdir('modules') if get_option('demos') @@ -726,8 +721,7 @@ pkgconf.set('GDK_PACKAGES', gdk_packages) pkgconf.set('GSK_PACKAGES', ' '.join([ 'graphene-gobject-1.0', graphene_req ])) pkgconf.set('GTK_PACKAGES', - ' '.join([ 'atk', atk_req, - 'gio-2.0', glib_req ])) + ' '.join([ 'gio-2.0', glib_req ])) # Requires.private pc_gdk_extra_libs += cairo_libs @@ -738,7 +732,7 @@ pkgconf.set('GDK_PRIVATE_PACKAGES', 'epoxy', epoxy_req ] + x11_pkgs + wayland_pkgs + cairo_backends)) pkgconf.set('GSK_PRIVATE_PACKAGES', '') # all already in GDK_PRIVATE_PACKAGES pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : [] -pkgconf.set('GTK_PRIVATE_PACKAGES', ' '.join(atk_pkgs + pangoft2_pkgs)) +pkgconf.set('GTK_PRIVATE_PACKAGES', ' '.join(pangoft2_pkgs)) pkgconf.set('GDK_EXTRA_LIBS', ' '.join(pc_gdk_extra_libs)) pkgconf.set('GSK_EXTRA_LIBS', '') |