upgrade from atk_2.30.0.bb to atk_2.31.92.bb delete atk/0001-Switch-from-filename-to-basename.patch beacuse this patch has been fixed
Signed-off-by: Zang Ruochen <zangrc.f...@cn.fujitsu.com> --- ...001-Switch-from-filename-to-basename.patch | 38 ------------------- .../atk/{atk_2.30.0.bb => atk_2.31.92.bb} | 5 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch rename meta/recipes-support/atk/{atk_2.30.0.bb => atk_2.31.92.bb} (86%) diff --git a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch deleted file mode 100644 index 047e81fb61..0000000000 --- a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted - -From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <jpuhl...@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 <jpuhl...@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 - diff --git a/meta/recipes-support/atk/atk_2.30.0.bb b/meta/recipes-support/atk/atk_2.31.92.bb similarity index 86% rename from meta/recipes-support/atk/atk_2.30.0.bb rename to meta/recipes-support/atk/atk_2.31.92.bb index 4e2dacbc4d..adec5bd980 100644 --- a/meta/recipes-support/atk/atk_2.30.0.bb +++ b/meta/recipes-support/atk/atk_2.31.92.bb @@ -30,10 +30,9 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr 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[archive.md5sum] = "45491b1a49ba01e0c522623c9ff40b28" +SRC_URI[archive.sha256sum] = "b06ec951d19971da8006c1bf846fc2bca2982cf6d735780e77d93c60531c5a18" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core