diff options
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-atk_2.32.0.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.32.1.bb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb index 8812d33d9a..bcf1c9c77a 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb | |||
| @@ -11,9 +11,6 @@ DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" | |||
| 11 | GNOMEBASEBUILDCLASS = "meson" | 11 | GNOMEBASEBUILDCLASS = "meson" |
| 12 | inherit gnomebase distro_features_check upstream-version-is-even | 12 | inherit gnomebase distro_features_check upstream-version-is-even |
| 13 | 13 | ||
| 14 | # The at-spi2-core requires x11 in DISTRO_FEATURES | ||
| 15 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 16 | |||
| 17 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" | 14 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" |
| 18 | 15 | ||
| 19 | FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" | 16 | FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" |
diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb index 0f84259d94..11052a8ece 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb | |||
| @@ -18,7 +18,9 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', | |||
| 18 | inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection | 18 | inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection |
| 19 | 19 | ||
| 20 | EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ | 20 | EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ |
| 21 | -Ddbus_daemon=${bindir}/dbus-daemon" | 21 | -Ddbus_daemon=${bindir}/dbus-daemon \ |
| 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ | ||
| 23 | " | ||
| 22 | 24 | ||
| 23 | GTKDOC_MESON_OPTION = "docs" | 25 | GTKDOC_MESON_OPTION = "docs" |
| 24 | 26 | ||
