summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch38
-rw-r--r--meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch7
-rw-r--r--meta/recipes-support/atk/atk_2.32.0.bb (renamed from meta/recipes-support/atk/atk_2.30.0.bb)9
3 files changed, 7 insertions, 47 deletions
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 @@
1Upstream-Status: Submitted
2
3From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001
4From: Jeremy Puhlman <jpuhlman@mvista.com>
5Date: Thu, 14 Jun 2018 17:21:49 +0000
6Subject: [PATCH] Switch from filename to basename
7
8When atk-enum-types.h is installed in to a system, the user likely has
9no access to the location where the headers were built, especially if
10the software was built in a sysroot environment. If the headers were
11built for a mulitlib environment, the build pathing may be different.
12Subsequently, if two mulitlib variants of atk are installed together the
13headers conflict for no other reason then they were built in two
14different locations. Switching from filename to basename, still should
15provide sufficient information on the providence of the enums, while not
16conflicting for really no good reason.
17
18Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
19---
20 atk/atk-enum-types.h.template | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
24index 7b4cec4..8321c24 100644
25--- a/atk/atk-enum-types.h.template
26+++ b/atk/atk-enum-types.h.template
27@@ -14,7 +14,7 @@ G_BEGIN_DECLS
28
29 /*** BEGIN file-production ***/
30
31-/* enumerations from "@filename@" */
32+/* enumerations from "@basename@" */
33 /*** END file-production ***/
34
35 /*** BEGIN value-header ***/
36--
372.14.1.459.g238e487
38
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 1d814ccdb7..d1b08bc04b 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 @@
1From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001 1From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 6 Apr 2018 12:04:00 +0800 3Date: Fri, 6 Apr 2018 12:04:00 +0800
4Subject: [PATCH] meson.build: enable introspection for cross-compile 4Subject: [PATCH] meson.build: enable introspection for cross-compile
@@ -9,16 +9,17 @@ if it should be disabled or not.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12
12--- 13---
13 atk/meson.build | 2 +- 14 atk/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/atk/meson.build b/atk/meson.build 17diff --git a/atk/meson.build b/atk/meson.build
17index 616a3e6..941ded8 100644 18index 0ad67e5..1d2a49c 100644
18--- a/atk/meson.build 19--- a/atk/meson.build
19+++ b/atk/meson.build 20+++ b/atk/meson.build
20@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, 21@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
21 dependencies: gobject_dep, 22 dependencies: glib_dep,
22 sources: atk_enum_h) 23 sources: atk_enum_h)
23 24
24-if not meson.is_cross_build() and get_option('introspection') 25-if not meson.is_cross_build() and get_option('introspection')
diff --git a/meta/recipes-support/atk/atk_2.30.0.bb b/meta/recipes-support/atk/atk_2.32.0.bb
index 4e22b3f811..67223729e9 100644
--- a/meta/recipes-support/atk/atk_2.30.0.bb
+++ b/meta/recipes-support/atk/atk_2.32.0.bb
@@ -14,12 +14,9 @@ DEPENDS = "gettext-native glib-2.0"
14GNOMEBASEBUILDCLASS = "meson" 14GNOMEBASEBUILDCLASS = "meson"
15inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection 15inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
16 16
17SRC_URI_append = " \ 17SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch"
18 file://0001-meson.build-enable-introspection-for-cross-compile.patch \ 18SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d"
19 file://0001-Switch-from-filename-to-basename.patch \ 19SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"
20 "
21SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454"
22SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"
23 20
24BBCLASSEXTEND = "native nativesdk" 21BBCLASSEXTEND = "native nativesdk"
25 22