at-spi2-core: update 2.46.0 -> 2.48.0

What's new in at-spi2-core 2.48.0:

* Add a "atk-only" build option. This allows atk to be built without libdbus
  installed, but it does not build libatspi or the atk bridge.

* Fix some typos in the documentation.

What's new in at-spi2-core 2.47.90:

* Downgrade meson requirement to 0.63.

*  at-spi-dbus-bus service: set stop timeout to 5s

* Fix possible crash in screen_reader_signal_watcher.

What's new in at-spi2-core 2.47.1:
* The meson options -Dx11 and -Dintrospection are now implemented with
  meson features - https://mesonbuild.com/Build-options.html#features

  Instead of accepting values of "yes/no/auto", they take
  "enabled/disabled/auto".  Please change your build scripts
  accordingly if you use these options.

* Use gi-docgen to generate documentation.

* Register key grabs using the focused window, rather than the root window.
  This should prevent the window from losing focus when a key grab is used.

* atk-adaptor: Handle sockets in GetChildren.

* Improve documentation of the dbus interfaces.

* Various code clean-ups. Some unused code has been removed.

(From OE-Core rev: c589c87a8caef0afbc731c219fe713ba970a2055)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 13 insertions, 10 deletions

diff --git a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb b/meta/recipes-support/atk/at-spi2-core_2.48.0.bb
index 90313467d0..e9648ffe07 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.48.0.bb
@@ -11,29 +11,32 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0"
+SRC_URI[sha256sum] = "905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30"
 
-DEPENDS = "dbus glib-2.0 glib-2.0-native libxml2"
+DEPENDS = " \
+        dbus \
+        glib-2.0 \
+        glib-2.0-native \
+        libxml2 \
+        ${@'python3-sphinx-native' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''} \
+"
 
 # For backwards compatibility
 PROVIDES += "atk at-spi2-atk"
 RPROVIDES:${PN} += "atk at-spi2-atk"
 
-inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection
+inherit meson gi-docgen gettext systemd pkgconfig upstream-version-is-even gobject-introspection
 
 EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
                   -Ddbus_daemon=${bindir}/dbus-daemon"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[x11] = "-Dx11=yes,-Dx11=no,virtual/libx11 libxi libxtst"
-
-GTKDOC_MESON_OPTION = "docs"
-# The documentation doesn't build if X11 is disabled. Appears to be fixed post 2.46.0.
-EXTRA_OEMESON += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "-Ddocs=false", d)}"
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxi libxtst"
 
+GIDOCGEN_MESON_OPTION = "docs"
 GIR_MESON_OPTION = 'introspection'
-GIR_MESON_ENABLE_FLAG = 'yes'
-GIR_MESON_DISABLE_FLAG = 'no'
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
 
 FILES:${PN} += "${libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop \
                 ${libdir}/gtk-2.0/modules/libatk-bridge.so \