summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <timonty.t.orling@linux.intel.com>2020-02-24 23:48:26 -0800
committerTim Orling <timothy.t.orling@linux.intel.com>2020-02-26 15:34:11 -0800
commit53744ea69c202793f83251afea4a009c6b6a9ec9 (patch)
tree4e5579e25a2dad7aecb8e947df72249e8f13e551
parent23ad05b98a2e1ced47aac3b1d7689c7146ff8c91 (diff)
downloadopenembedded-core-contrib-53744ea69c202793f83251afea4a009c6b6a9ec9.tar.gz
openembedded-core-contrib-53744ea69c202793f83251afea4a009c6b6a9ec9.tar.bz2
openembedded-core-contrib-53744ea69c202793f83251afea4a009c6b6a9ec9.zip
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 Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
-rw-r--r--meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch29
-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 @@
-From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Fri, 6 Apr 2018 12:04:00 +0800
-Subject: [PATCH] meson.build: enable introspection for cross-compile
-
-It works fine in OE-core and doesn't need to be disabled. Let the user decide
-if it should be disabled or not.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
----
- atk/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/atk/meson.build b/atk/meson.build
-index 0ad67e5..1d2a49c 100644
---- a/atk/meson.build
-+++ b/atk/meson.build
-@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
- dependencies: glib_dep,
- sources: atk_enum_h)
-
--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.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"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
-SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch"
-SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d"
-SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"
+SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9"
+SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"
BBCLASSEXTEND = "native nativesdk"