diff options
| author |   Tim Orling <ticotimo@gmail.com> | 2021-10-15 19:55:39 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-16 17:43:53 +0100 |
| commit | 05c0e34122ea1272704ddb90657e592f15f5c557 (patch) | |
| tree | 0318dd371ae04d99a06cbe67b1c99167ba0f5234 | |
| parent | 0c192a97e3e1c015a48667d6903cc07a8b2620e4 (diff) | |
| download | openembedded-core-contrib-05c0e34122ea1272704ddb90657e592f15f5c557.tar.gz | |
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
Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.42.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.40.3.bb) | 6 |
2 files changed, 37 insertions, 2 deletions
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 <timothy.t.orling@intel.com> +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 <timothy.t.orling@intel.com> +--- + 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.42.0.bb index 427ea7c165..e09c74ac7f 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.40.3.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.42.0.bb @@ -9,9 +9,11 @@ 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 = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-Ensure-x11_dep-is-defined.patch \ + " -SRC_URI[sha256sum] = "e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c" +SRC_URI[sha256sum] = "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386" X11DEPENDS = "virtual/libx11 libxi libxtst" |