mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

atk: upgrade 2.28.1 -> 2.30.0

Browse Source 
* 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>
This commit is contained in:
Anuj Mittal
2018-12-20 16:43:34 +08:00
committed by Richard Purdie
parent 3bc3af2f51
commit 2661cf0a36
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
+7 -7
View File
@@ -1,4 +1,4 @@
From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com> From: Anuj Mittal <anuj.mittal@intel.com>
Date: Fri, 6 Apr 2018 12:04:00 +0800 Date: Fri, 6 Apr 2018 12:04:00 +0800
Subject: [PATCH] meson.build: enable introspection for cross-compile Subject: [PATCH] meson.build: enable introspection for cross-compile
@@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atk/meson.build b/atk/meson.build diff --git a/atk/meson.build b/atk/meson.build
index 7b5a683..855e28f 100644 index 616a3e6..941ded8 100644
--- a/atk/meson.build --- a/atk/meson.build
+++ b/atk/meson.build +++ b/atk/meson.build
@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, @@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
dependencies: gobject_dep,
sources: atk_enum_h)
disable_introspection = get_option('disable_introspection') -if not meson.is_cross_build() and get_option('introspection')
+if get_option('introspection')
-if not meson.is_cross_build() and not disable_introspection
+if not disable_introspection
gnome.generate_gir(libatk, gnome.generate_gir(libatk,
sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
namespace: 'Atk', namespace: 'Atk',
meta/recipes-support/atk/atk_2.28.1.bb → meta/recipes-support/atk/atk_2.30.0.bb
+6 -6
View File
@@ -14,11 +14,11 @@ DEPENDS = "gettext-native glib-2.0"
GNOMEBASEBUILDCLASS = "meson" GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
GTKDOC_ENABLE_FLAG = "-Denable_docs=true" GTKDOC_ENABLE_FLAG = "-Ddocs=true"
GTKDOC_DISABLE_FLAG = "-Denable_docs=false" GTKDOC_DISABLE_FLAG = "-Ddocs=false"
GI_ENABLE_FLAG = "-Ddisable_introspection=false" GI_ENABLE_FLAG = "-Dintrospection=true"
GI_DISABLE_FLAG = "-Ddisable_introspection=true" GI_DISABLE_FLAG = "-Dintrospection=false"
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
'${GI_DISABLE_FLAG}', d)} " '${GI_DISABLE_FLAG}', d)} "
@@ -30,8 +30,8 @@ SRC_URI_append = " \
file://0001-meson.build-enable-introspection-for-cross-compile.patch \ file://0001-meson.build-enable-introspection-for-cross-compile.patch \
file://0001-Switch-from-filename-to-basename.patch \ file://0001-Switch-from-filename-to-basename.patch \
" "
SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454"
SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"