summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-19 17:38:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 08:14:23 +0000
commitcfc61547be30ce10fcf982690c3c4122776bceb8 (patch)
tree9c8c8445baf08f7d2ccfaf477bc36ebd73b88811 /meta
parent344ce08822266a35c4d3aa84413d3d572339f8e8 (diff)
downloadpoky-cfc61547be30ce10fcf982690c3c4122776bceb8.tar.gz
at-spi2-core: upgrade to 2.14.1
Drop core_acinclude_m4.patch, merged upstream. (From OE-Core rev: 311df48b13098f3c5f51bb9f04eeba63c1aa46b3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.14.1.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.12.0.bb)8
-rw-r--r--meta/recipes-support/atk/files/core_acinclude_m4.patch40
2 files changed, 3 insertions, 45 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
index e67155ccbd..586516604a 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
@@ -4,12 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
4 4
5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6 6
7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ 7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
8 file://core_acinclude_m4.patch \
9 "
10 8
11SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef" 9SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
12SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89" 10SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657"
13 11
14DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" 12DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
15 13
diff --git a/meta/recipes-support/atk/files/core_acinclude_m4.patch b/meta/recipes-support/atk/files/core_acinclude_m4.patch
deleted file mode 100644
index 29c538e2c3..0000000000
--- a/meta/recipes-support/atk/files/core_acinclude_m4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1at-spi2-core: fix alignof m4 macro
2
3DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify
4it to use AC_CHECK_ALIGNOF.
5
6Upstream-Status: Pending
7
8Signed-off-by: joe.slater@windriver.com
9
10
11--- a/acinclude.m4
12+++ b/acinclude.m4
13@@ -2,7 +2,26 @@
14 # type alignment test #
15 #######################
16
17-AC_DEFUN([DBIND_CHECK_ALIGNOF],
18+AC_DEFUN([DBIND_CHECK_ALIGNOF],[
19+AC_CHECK_ALIGNOF($1,[
20+#include <stdio.h>
21+#include <stdlib.h>
22+#define DBUS_API_SUBJECT_TO_CHANGE
23+#include <dbus/dbus.h>
24+typedef struct {char s1;} dbind_struct;
25+typedef void *dbind_pointer;
26+])
27+
28+dnl Note that we substitute for names like @DBIND_ALIGNOF_DBIND_STRUCT@, but
29+dnl we #define names like ALIGNOF_DBIND_STRUCT in config.h!
30+dnl
31+AC_SUBST(translit(dbind_alignof_$1, [a-z *], [A-Z_P]),[$ac_cv_alignof_$1])
32+
33+])
34+
35+dnl The following does not work for cross-compilation.
36+dnl
37+AC_DEFUN([xDBIND_CHECK_ALIGNOF],
38 [changequote(<<, >>)dnl
39 dnl The name to #define.
40 define(<<AC_TYPE_NAME>>,