From 2661cf0a3644ffef9d7afffca3605c6049f722f8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 20 Dec 2018 16:43:34 +0800 Subject: 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 Signed-off-by: Richard Purdie --- ...ld-enable-introspection-for-cross-compile.patch | 14 ++++---- meta/recipes-support/atk/atk_2.28.1.bb | 37 ---------------------- meta/recipes-support/atk/atk_2.30.0.bb | 37 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-support/atk/atk_2.28.1.bb create mode 100644 meta/recipes-support/atk/atk_2.30.0.bb (limited to 'meta/recipes-support/atk') 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 @@ -From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 +From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 6 Apr 2018 12:04:00 +0800 Subject: [PATCH] meson.build: enable introspection for cross-compile @@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atk/meson.build b/atk/meson.build -index 7b5a683..855e28f 100644 +index 616a3e6..941ded8 100644 --- a/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 not disable_introspection -+if not disable_introspection +-if not meson.is_cross_build() and get_option('introspection') ++if get_option('introspection') gnome.generate_gir(libatk, sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.28.1.bb deleted file mode 100644 index 26b13b69d7..0000000000 --- a/meta/recipes-support/atk/atk_2.28.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -DEPENDS = "gettext-native glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" - -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -SRC_URI_append = " \ - file://0001-meson.build-enable-introspection-for-cross-compile.patch \ - file://0001-Switch-from-filename-to-basename.patch \ - " -SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" -SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" - -BBCLASSEXTEND = "native" - diff --git a/meta/recipes-support/atk/atk_2.30.0.bb b/meta/recipes-support/atk/atk_2.30.0.bb new file mode 100644 index 0000000000..c950862b6f --- /dev/null +++ b/meta/recipes-support/atk/atk_2.30.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +# Need gettext-native as Meson can't turn off i18n +DEPENDS = "gettext-native glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +GTKDOC_ENABLE_FLAG = "-Ddocs=true" +GTKDOC_DISABLE_FLAG = "-Ddocs=false" + +GI_ENABLE_FLAG = "-Dintrospection=true" +GI_DISABLE_FLAG = "-Dintrospection=false" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +SRC_URI_append = " \ + file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + file://0001-Switch-from-filename-to-basename.patch \ + " +SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" +SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" + +BBCLASSEXTEND = "native" + -- cgit v1.2.3-54-g00ecf