summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch33
-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 @@
1From 9e726133319298a835f724904c80e5adf78f475f Mon Sep 17 00:00:00 2001
2From: Tim Orling <timothy.t.orling@intel.com>
3Date: Fri, 15 Oct 2021 18:00:04 +0000
4Subject: [PATCH] Ensure x11_dep is defined
5
6bus/meson.build checks if x11_dep.found(), but this fails when
7-Dx11=no
8
9Upstream-Status: Submitted
10[https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60]
11
12References:
13 https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42
14 https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency
15
16Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
17---
18 meson.build | 2 ++
19 1 file changed, 2 insertions(+)
20
21diff --git a/meson.build b/meson.build
22index b5104c8..85d7a0e 100644
23--- a/meson.build
24+++ b/meson.build
25@@ -62,6 +62,8 @@ endif
26
27 x11_deps = []
28 x11_option = get_option('x11')
29+# ensure x11_dep is defined for use in bus/meson.build
30+x11_dep = dependency('', required: false)
31 if x11_option != 'no'
32 x11_dep = dependency('x11', required: false)
33
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"
9 9
10MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 10MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
11 11
12SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" 12SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
13 file://0001-Ensure-x11_dep-is-defined.patch \
14 "
13 15
14SRC_URI[sha256sum] = "e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c" 16SRC_URI[sha256sum] = "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386"
15 17
16X11DEPENDS = "virtual/libx11 libxi libxtst" 18X11DEPENDS = "virtual/libx11 libxi libxtst"
17 19