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 <timothy.t.orling@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling
2021-10-15 19:55:39 +00:00
committed by Richard Purdie
parent b3fd59873d
commit 25675706b6
2 changed files with 37 additions and 2 deletions

View File

@@ -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)

View File

@@ -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"