From 62980ea8ac6e56aa3b192ed3a53199d563f2df59 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Apr 2015 17:36:47 +0000 Subject: at-spi2-core: Add nls.m4 from gettext This is needed for building it with musl, since we disable NLS, I think it will fails in same way with glibc if NLS was disabled there too Change-Id: I95c6858adfb33361cab466999e0bacb47c1e1fde (From OE-Core rev: 5dc86b1a45581e2b6ae845b818e2323645c9cff4) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0001-nls.m4-Take-it-from-gettext-0.15.patch | 54 ++++++++++++++++++++++ meta/recipes-support/atk/at-spi2-core_2.14.1.bb | 4 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch (limited to 'meta/recipes-support/atk') diff --git a/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch b/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch new file mode 100644 index 0000000000..69a51d5662 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch @@ -0,0 +1,54 @@ +From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 5 Apr 2015 09:08:38 -0700 +Subject: [PATCH] nls.m4: Take it from gettext-0.15 + +It otherwise expects gettext to provide it. Lets go independent + +Signed-off-by: Khem Raj + +Upstream-Status: Pending +--- + m4/nls.m4 | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + create mode 100644 m4/nls.m4 + +diff --git a/m4/nls.m4 b/m4/nls.m4 +new file mode 100644 +index 0000000..2c8fe69 +--- /dev/null ++++ b/m4/nls.m4 +@@ -0,0 +1,30 @@ ++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are not in the public domain. ++ ++dnl Authors: ++dnl Ulrich Drepper drepper@cygnus.com, 1995-2000. ++dnl Bruno Haible haible@clisp.cons.org, 2000-2003. ++ ++AC_PREREQ(2.50) ++ ++AC_DEFUN([AM_NLS], ++[ ++AC_MSG_CHECKING([whether NLS is requested]) ++dnl Default is enabled NLS ++AC_ARG_ENABLE(nls, ++[ --disable-nls do not use Native Language Support], ++USE_NLS=$enableval, USE_NLS=yes) ++AC_MSG_RESULT($USE_NLS) ++AC_SUBST(USE_NLS) ++]) +-- +2.1.4 + diff --git a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb index 1a1ce6c5ee..a4d2b3a8a2 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb @@ -4,7 +4,9 @@ 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" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ + " SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a" SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657" -- cgit v1.2.3-54-g00ecf