From 311df48b13098f3c5f51bb9f04eeba63c1aa46b3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 19 Dec 2014 17:38:47 +0000 Subject: at-spi2-core: upgrade to 2.14.1 Drop core_acinclude_m4.patch, merged upstream. Signed-off-by: Ross Burton --- .../atk/files/core_acinclude_m4.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 meta/recipes-support/atk/files/core_acinclude_m4.patch (limited to 'meta/recipes-support/atk/files') 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 @@ -at-spi2-core: fix alignof m4 macro - -DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify -it to use AC_CHECK_ALIGNOF. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2,7 +2,26 @@ - # type alignment test # - ####################### - --AC_DEFUN([DBIND_CHECK_ALIGNOF], -+AC_DEFUN([DBIND_CHECK_ALIGNOF],[ -+AC_CHECK_ALIGNOF($1,[ -+#include -+#include -+#define DBUS_API_SUBJECT_TO_CHANGE -+#include -+typedef struct {char s1;} dbind_struct; -+typedef void *dbind_pointer; -+]) -+ -+dnl Note that we substitute for names like @DBIND_ALIGNOF_DBIND_STRUCT@, but -+dnl we #define names like ALIGNOF_DBIND_STRUCT in config.h! -+dnl -+AC_SUBST(translit(dbind_alignof_$1, [a-z *], [A-Z_P]),[$ac_cv_alignof_$1]) -+ -+]) -+ -+dnl The following does not work for cross-compilation. -+dnl -+AC_DEFUN([xDBIND_CHECK_ALIGNOF], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<>, -- cgit 1.2.3-korg