mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-28 06:32:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

atk: upgrade 2.30.0 -> 2.32.0

Browse Source 
(From OE-Core rev: 7e2e6852691e8ac40424f73b46225cda907c6ab6)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-05-20 16:10:52 +02:00
committed by Richard Purdie
parent 084751c163
commit 0b801cd317
3 changed files with 7 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
View File

@@ -1,38 +0,0 @@
Upstream-Status: Submitted
From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Thu, 14 Jun 2018 17:21:49 +0000
Subject: [PATCH] Switch from filename to basename
When atk-enum-types.h is installed in to a system, the user likely has
no access to the location where the headers were built, especially if
the software was built in a sysroot environment. If the headers were
built for a mulitlib environment, the build pathing may be different.
Subsequently, if two mulitlib variants of atk are installed together the
headers conflict for no other reason then they were built in two
different locations. Switching from filename to basename, still should
provide sufficient information on the providence of the enums, while not
conflicting for really no good reason.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
atk/atk-enum-types.h.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
index 7b4cec4..8321c24 100644
--- a/atk/atk-enum-types.h.template
+++ b/atk/atk-enum-types.h.template
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
--
2.14.1.459.g238e487

7
meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
View File

@@ -1,4 +1,4 @@
From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001
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
@@ -9,16 +9,17 @@ 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 616a3e6..941ded8 100644
index 0ad67e5..1d2a49c 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
dependencies: gobject_dep,
dependencies: glib_dep,
sources: atk_enum_h)
-if not meson.is_cross_build() and get_option('introspection')

9
meta/recipes-support/atk/atk_2.30.0.bb → meta/recipes-support/atk/atk_2.32.0.bb
View File

@@ -14,12 +14,9 @@ DEPENDS = "gettext-native glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
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"
SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch"
SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d"
SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"
BBCLASSEXTEND = "native nativesdk"