diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-12-20 16:43:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-11 10:39:08 +0000 |
commit | 2661cf0a3644ffef9d7afffca3605c6049f722f8 (patch) | |
tree | 1ce028ae5cdec598b18737e97e13f434c9773074 /meta/recipes-support | |
parent | 3bc3af2f51226170843bb7c825948734886d6682 (diff) | |
download | poky-2661cf0a3644ffef9d7afffca3605c6049f722f8.tar.gz |
atk: upgrade 2.28.1 -> 2.30.0
* For changes, see:
https://github.com/GNOME/atk/blob/ATK_2_30_0/NEWS
* Change in doc and introspection switches and patch refresh.
(From OE-Core rev: 94ad442204346259b9bbcaec5a8df0149fc3a0a7)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch | 14 | ||||
-rw-r--r-- | meta/recipes-support/atk/atk_2.30.0.bb (renamed from meta/recipes-support/atk/atk_2.28.1.bb) | 12 |
2 files changed, 13 insertions, 13 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 index c604a984a4..1d814ccdb7 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 | 1 | From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Fri, 6 Apr 2018 12:04:00 +0800 | 3 | Date: Fri, 6 Apr 2018 12:04:00 +0800 |
4 | Subject: [PATCH] meson.build: enable introspection for cross-compile | 4 | Subject: [PATCH] meson.build: enable introspection for cross-compile |
@@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/atk/meson.build b/atk/meson.build | 16 | diff --git a/atk/meson.build b/atk/meson.build |
17 | index 7b5a683..855e28f 100644 | 17 | index 616a3e6..941ded8 100644 |
18 | --- a/atk/meson.build | 18 | --- a/atk/meson.build |
19 | +++ b/atk/meson.build | 19 | +++ b/atk/meson.build |
20 | @@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, | 20 | @@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, |
21 | dependencies: gobject_dep, | ||
22 | sources: atk_enum_h) | ||
21 | 23 | ||
22 | disable_introspection = get_option('disable_introspection') | 24 | -if not meson.is_cross_build() and get_option('introspection') |
23 | 25 | +if get_option('introspection') | |
24 | -if not meson.is_cross_build() and not disable_introspection | ||
25 | +if not disable_introspection | ||
26 | gnome.generate_gir(libatk, | 26 | gnome.generate_gir(libatk, |
27 | sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], | 27 | sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], |
28 | namespace: 'Atk', | 28 | namespace: 'Atk', |
diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.30.0.bb index 26b13b69d7..c950862b6f 100644 --- a/meta/recipes-support/atk/atk_2.28.1.bb +++ b/meta/recipes-support/atk/atk_2.30.0.bb | |||
@@ -14,11 +14,11 @@ 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 | GTKDOC_ENABLE_FLAG = "-Denable_docs=true" | 17 | GTKDOC_ENABLE_FLAG = "-Ddocs=true" |
18 | GTKDOC_DISABLE_FLAG = "-Denable_docs=false" | 18 | GTKDOC_DISABLE_FLAG = "-Ddocs=false" |
19 | 19 | ||
20 | GI_ENABLE_FLAG = "-Ddisable_introspection=false" | 20 | GI_ENABLE_FLAG = "-Dintrospection=true" |
21 | GI_DISABLE_FLAG = "-Ddisable_introspection=true" | 21 | GI_DISABLE_FLAG = "-Dintrospection=false" |
22 | 22 | ||
23 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ | 23 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ |
24 | '${GI_DISABLE_FLAG}', d)} " | 24 | '${GI_DISABLE_FLAG}', d)} " |
@@ -30,8 +30,8 @@ SRC_URI_append = " \ | |||
30 | file://0001-meson.build-enable-introspection-for-cross-compile.patch \ | 30 | file://0001-meson.build-enable-introspection-for-cross-compile.patch \ |
31 | file://0001-Switch-from-filename-to-basename.patch \ | 31 | file://0001-Switch-from-filename-to-basename.patch \ |
32 | " | 32 | " |
33 | SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" | 33 | SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" |
34 | SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" | 34 | SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native" | 36 | BBCLASSEXTEND = "native" |
37 | 37 | ||