From 25675706b6339b6a11e69dbad1c885a4b79fc57c Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 15 Oct 2021 19:55:39 +0000 Subject: at-spi2-core: upgrade 2.40.3 -> 2.42.0 Add patch to ensure x11_dep is defined. What's new in at-spi2-core 2.42.0: * Set X root property when Xwayland starts on demand. * Several dbus introspection fixes. Reference: https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42 https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60 (From OE-Core rev: 05c0e34122ea1272704ddb90657e592f15f5c557) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../0001-Ensure-x11_dep-is-defined.patch | 33 +++++++++++++++++ meta/recipes-support/atk/at-spi2-core_2.40.3.bb | 39 -------------------- meta/recipes-support/atk/at-spi2-core_2.42.0.bb | 41 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch delete mode 100644 meta/recipes-support/atk/at-spi2-core_2.40.3.bb create mode 100644 meta/recipes-support/atk/at-spi2-core_2.42.0.bb (limited to 'meta/recipes-support/atk') diff --git a/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch b/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch new file mode 100644 index 0000000000..4a9bbbcbb1 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch @@ -0,0 +1,33 @@ +From 9e726133319298a835f724904c80e5adf78f475f Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Fri, 15 Oct 2021 18:00:04 +0000 +Subject: [PATCH] Ensure x11_dep is defined + +bus/meson.build checks if x11_dep.found(), but this fails when +-Dx11=no + +Upstream-Status: Submitted +[https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60] + +References: + https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42 + https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency + +Signed-off-by: Tim Orling +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index b5104c8..85d7a0e 100644 +--- a/meson.build ++++ b/meson.build +@@ -62,6 +62,8 @@ endif + + x11_deps = [] + x11_option = get_option('x11') ++# ensure x11_dep is defined for use in bus/meson.build ++x11_dep = dependency('', required: false) + if x11_option != 'no' + x11_dep = dependency('x11', required: false) + diff --git a/meta/recipes-support/atk/at-spi2-core_2.40.3.bb b/meta/recipes-support/atk/at-spi2-core_2.40.3.bb deleted file mode 100644 index 427ea7c165..0000000000 --- a/meta/recipes-support/atk/at-spi2-core_2.40.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" - -DESCRIPTION = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked." - -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -BUGTRACKER = "http://bugzilla.gnome.org/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c" - -X11DEPENDS = "virtual/libx11 libxi libxtst" - -DEPENDS = "dbus glib-2.0" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" - -inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection - -EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ - -Ddbus_daemon=${bindir}/dbus-daemon \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ -" - -GTKDOC_MESON_OPTION = "docs" - -GIR_MESON_OPTION = 'introspection' -GIR_MESON_ENABLE_FLAG = 'yes' -GIR_MESON_DISABLE_FLAG = 'no' - -FILES:${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/at-spi2-core_2.42.0.bb b/meta/recipes-support/atk/at-spi2-core_2.42.0.bb new file mode 100644 index 0000000000..e09c74ac7f --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core_2.42.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" + +DESCRIPTION = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked." + +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +BUGTRACKER = "http://bugzilla.gnome.org/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-Ensure-x11_dep-is-defined.patch \ + " + +SRC_URI[sha256sum] = "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386" + +X11DEPENDS = "virtual/libx11 libxi libxtst" + +DEPENDS = "dbus glib-2.0" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" + +inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection + +EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ + -Ddbus_daemon=${bindir}/dbus-daemon \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ +" + +GTKDOC_MESON_OPTION = "docs" + +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = 'yes' +GIR_MESON_DISABLE_FLAG = 'no' + +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf