[oe-commits] Ross Burton : at-spi2-core: upgrade to 2.14.1

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 71d7396d48dc6097f024d2466d34be3e35723ea3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=71d7396d48dc6097f024d2466d34be3e35723ea3

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Dec 19 17:38:47 2014 +0000

at-spi2-core: upgrade to 2.14.1

Drop core_acinclude_m4.patch, merged upstream.

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 ...-spi2-core_2.12.0.bb => at-spi2-core_2.14.1.bb} |  8 ++---
 .../atk/files/core_acinclude_m4.patch              | 40 ----------------------
 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
similarity index 71%
rename from meta/recipes-support/atk/at-spi2-core_2.12.0.bb
rename to meta/recipes-support/atk/at-spi2-core_2.14.1.bb
index e67155c..5865166 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"
 
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
-           file://core_acinclude_m4.patch \
-          "
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef"
-SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89"
+SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
+SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657"
 
 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
 
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 29c538e..0000000
--- 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 at 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 <stdio.h>
-+#include <stdlib.h>
-+#define DBUS_API_SUBJECT_TO_CHANGE
-+#include <dbus/dbus.h>
-+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(<<AC_TYPE_NAME>>,