diff options
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/atk/at-spi2-atk_2.38.0.bb | 20 | ||||
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.46.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.44.1.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-support/atk/atk_2.38.0.bb | 20 |
4 files changed, 9 insertions, 45 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5b7ce77c3cc..03db94824d0 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -46,9 +46,7 @@ RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-at = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-atk = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-attr = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER:pn-autoconf = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>" diff --git a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb deleted file mode 100644 index 87f7b83c7d0..00000000000 --- a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -DESCRIPTION = "Contains a library that bridges ATK to At-Spi2 D-Bus service. Toolkit widgets use it to provide their content to screen readers such as Orca." -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -BUGTRACKER = "http://bugzilla.gnome.org/" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.sha256sum] = "cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f" - -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase upstream-version-is-even - -PACKAGES =+ "${PN}-gnome ${PN}-gtk2" - -FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -FILES:${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/at-spi2-core_2.44.1.bb b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb index 95a6c619f0e..5ab501908d5 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.44.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb @@ -11,13 +11,17 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746" +SRC_URI[sha256sum] = "aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0" X11DEPENDS = "virtual/libx11 libxi libxtst" -DEPENDS = "dbus glib-2.0" +DEPENDS = "dbus glib-2.0 libxml2" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" +# 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 EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ @@ -31,7 +35,9 @@ GIR_MESON_OPTION = 'introspection' GIR_MESON_ENABLE_FLAG = 'yes' GIR_MESON_DISABLE_FLAG = 'no' -FILES:${PN} += "${datadir}/dbus-1/services/*.service \ +FILES:${PN} += "${libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop \ + ${libdir}/gtk-2.0/modules/libatk-bridge.so \ + ${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service \ ${datadir}/defaults/at-spi2 \ ${systemd_user_unitdir}/at-spi-dbus-bus.serviceĀ \ diff --git a/meta/recipes-support/atk/atk_2.38.0.bb b/meta/recipes-support/atk/atk_2.38.0.bb deleted file mode 100644 index 62fec9abf8d..00000000000 --- a/meta/recipes-support/atk/atk_2.38.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -DESCRIPTION = "Provides application programming interfaces (APIs) for implementing accessibility support in software." -HOMEPAGE = "https://wiki.gnome.org/Accessibility" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/atk/-/issues" -SECTION = "x11/libs" - -LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -DEPENDS = "gettext-native glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.sha256sum] = "ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36" - -BBCLASSEXTEND = "native nativesdk" |