diff options
Diffstat (limited to 'meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch | 33 |
1 files changed, 0 insertions, 33 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 deleted file mode 100644 index 4a9bbbcbb1..0000000000 --- a/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 9e726133319298a835f724904c80e5adf78f475f Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <timothy.t.orling@intel.com> | ||
3 | Date: Fri, 15 Oct 2021 18:00:04 +0000 | ||
4 | Subject: [PATCH] Ensure x11_dep is defined | ||
5 | |||
6 | bus/meson.build checks if x11_dep.found(), but this fails when | ||
7 | -Dx11=no | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | [https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60] | ||
11 | |||
12 | References: | ||
13 | https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42 | ||
14 | https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency | ||
15 | |||
16 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> | ||
17 | --- | ||
18 | meson.build | 2 ++ | ||
19 | 1 file changed, 2 insertions(+) | ||
20 | |||
21 | diff --git a/meson.build b/meson.build | ||
22 | index 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 | |||