diff options
author | Tim Orling <timonty.t.orling@linux.intel.com> | 2020-02-26 16:06:00 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-29 13:04:49 +0000 |
commit | b1515d967ebea8d9f82b89749657ddc103ff831e (patch) | |
tree | 73becd6e51ef68137a647b670c613ff1eab8bec4 | |
parent | 1ae1fb6f14605bd1388f47b77a64a19c579dfdf4 (diff) | |
download | poky-b1515d967ebea8d9f82b89749657ddc103ff831e.tar.gz |
atk: upgrade 2.32.0 -> 2.34.1
Patch no longer applies (nor is needed) upstream.
Release notes:
https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS
(From OE-Core rev: eaf19af52d166295494863379049868375498c0a)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/atk/atk_2.34.1.bb (renamed from meta/recipes-support/atk/atk_2.32.0.bb) | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc04b..0000000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 6 Apr 2018 12:04:00 +0800 | ||
4 | Subject: [PATCH] meson.build: enable introspection for cross-compile | ||
5 | |||
6 | It works fine in OE-core and doesn't need to be disabled. Let the user decide | ||
7 | if it should be disabled or not. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | |||
13 | --- | ||
14 | atk/meson.build | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/atk/meson.build b/atk/meson.build | ||
18 | index 0ad67e5..1d2a49c 100644 | ||
19 | --- a/atk/meson.build | ||
20 | +++ b/atk/meson.build | ||
21 | @@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, | ||
22 | dependencies: glib_dep, | ||
23 | sources: atk_enum_h) | ||
24 | |||
25 | -if not meson.is_cross_build() and get_option('introspection') | ||
26 | +if get_option('introspection') | ||
27 | gnome.generate_gir(libatk, | ||
28 | sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], | ||
29 | namespace: 'Atk', | ||
diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb index 67223729e9..277397c694 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb | |||
@@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" | |||
14 | GNOMEBASEBUILDCLASS = "meson" | 14 | GNOMEBASEBUILDCLASS = "meson" |
15 | inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection | 15 | inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection |
16 | 16 | ||
17 | SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" | 17 | SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" |
18 | SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" | 18 | SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" |
19 | SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" | ||
20 | 19 | ||
21 | BBCLASSEXTEND = "native nativesdk" | 20 | BBCLASSEXTEND = "native nativesdk" |
22 | 21 | ||