[gnome-continuous-yocto/gnomeostree-3.14-dizzy] core: Update gettext to 0.19.6

[Emmanuele Bassi <ebassi src gnome org>]

commit ff25881217233035751f06165a93b64187fd3dd1
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 29 18:40:44 2016 +0100

    core: Update gettext to 0.19.6
    
    Backport the recipes and patches from current Yocto.

 .../gettext-0.19.6/add-with-bisonlocaledir.patch   |   58 ++++++++++++++++++++
 .../parallel.patch                                 |    0
 .../{gettext_0.19.4.bb => gettext_0.19.6.bb}       |   27 ++++++---
 3 files changed, 76 insertions(+), 9 deletions(-)
---
diff --git a/meta/recipes-core/gettext/gettext-0.19.6/add-with-bisonlocaledir.patch 
b/meta/recipes-core/gettext/gettext-0.19.6/add-with-bisonlocaledir.patch
new file mode 100644
index 0000000..35a1310
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.19.6/add-with-bisonlocaledir.patch
@@ -0,0 +1,58 @@
+From 04bd40fe2c48c6e01ab418a04d27c4aff644ad96 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu jia windriver com>
+Date: Wed, 17 Feb 2016 23:54:02 -0500
+Subject: [PATCH] m4/bison-i18n.m4: add --with-bisonlocaledir to assign
+ BISON_LOCALEDIR
+
+The variable BISON_LOCALEDIR is assigned only by the output of
+'bison --print-localedir', we add option --with-bisonlocaledir
+to assign it explicitly. It is helpful for user to split the
+native compile and cross compile.
+
+For backward compatibility, if option not used, it still
+make use of the output of 'bison --print-localedir'.
+
+Upstream-Status: Submitted [bison-patches gnu org]
+
+Signed-off-by: Hongxu Jia <hongxu jia windriver com>
+---
+ gettext-tools/gnulib-m4/bison-i18n.m4 | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gettext-tools/gnulib-m4/bison-i18n.m4 b/gettext-tools/gnulib-m4/bison-i18n.m4
+index f5cfd3a..fb6ac4d 100644
+--- a/gettext-tools/gnulib-m4/bison-i18n.m4
++++ b/gettext-tools/gnulib-m4/bison-i18n.m4
+@@ -14,11 +14,16 @@ dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files
+ dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all.
+ AC_DEFUN([BISON_I18N],
+ [
++  dnl Default is not to set bisonlocaledir
++  AC_ARG_WITH([bisonlocaledir],
++    [  --with-bisonlocaledir   sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files],
++    BISON_LOCALEDIR=$withval,
++    BISON_LOCALEDIR=)
++
+   if test -z "$USE_NLS"; then
+     echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2
+     exit 1
+   fi
+-  BISON_LOCALEDIR=
+   BISON_USE_NLS=no
+   if test "$USE_NLS" = yes; then
+     dnl Determine bison's localedir.
+@@ -26,9 +31,10 @@ AC_DEFUN([BISON_I18N],
+     dnl But even is YACC is called "yacc", it may be a script that invokes bison
+     dnl and accepts the --print-localedir option.
+     dnl YACC's default value is empty; BISON's default value is :.
+-    if (${YACC-${BISON-:}} --print-localedir) >/dev/null 2>&1; then
++    if test -z "$BISON_LOCALEDIR" -a ${YACC-${BISON-:}} --print-localedir >/dev/null 2>&1; then
+       BISON_LOCALEDIR=`${YACC-${BISON-:}} --print-localedir`
+     fi
++    AC_MSG_RESULT([$BISON_LOCALEDIR])
+     AC_SUBST([BISON_LOCALEDIR])
+     if test -n "$BISON_LOCALEDIR"; then
+       dnl There is no need to enable internationalization if the user doesn't
+-- 
+1.9.1
+
diff --git a/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch 
b/meta/recipes-core/gettext/gettext-0.19.6/parallel.patch
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.4/parallel.patch
rename to meta/recipes-core/gettext/gettext-0.19.6/parallel.patch
diff --git a/meta/recipes-core/gettext/gettext_0.19.4.bb b/meta/recipes-core/gettext/gettext_0.19.6.bb
similarity index 87%
rename from meta/recipes-core/gettext/gettext_0.19.4.bb
rename to meta/recipes-core/gettext/gettext_0.19.6.bb
index 6af802a..592e4fc 100644
--- a/meta/recipes-core/gettext/gettext_0.19.4.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.6.bb
@@ -11,16 +11,17 @@ PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
 RCONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-       file://parallel.patch \
-          "
+          file://parallel.patch \
+          file://add-with-bisonlocaledir.patch \
+"
+
+SRC_URI[md5sum] = "6d1447f8c5c45c329371ef4bfe7d79a5"
+SRC_URI[sha256sum] = "ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d"
 
 PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
 
 LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
 
-SRC_URI[md5sum] = "d3511af1e604a3478900d2c2b4a4a48e"
-SRC_URI[sha256sum] = "8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f"
-
 inherit autotools texinfo
 
 EXTRA_OECONF += "--without-lispdir \
@@ -38,10 +39,18 @@ EXTRA_OECONF += "--without-lispdir \
                  --with-included-libcroco \
                  --with-included-libunistring \
                 "
+EXTRA_OECONF_append_class-target = " \
+                 --with-bisonlocaledir=${datadir}/locale \
+"
 
 acpaths = '-I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'
 
+do_install_append_libc-musl () {
+       rm -f ${D}${libdir}/charset.alias
+       rm -f ${D}${includedir}/libintl.h
+       rm -f ${D}${libdir}/libintl.la
+}
 
 # these lack the .x behind the .so, but shouldn't be in the -dev package
 # Otherwise you get the following results:
@@ -97,10 +106,10 @@ do_install_append() {
 }
 
 do_install_append_class-native () {
-    rm ${D}${datadir}/aclocal/*
-    rm ${D}${datadir}/gettext/config.rpath
-    rm ${D}${datadir}/gettext/po/Makefile.in.in
-    rm ${D}${datadir}/gettext/po/remove-potcdate.sin
+       rm ${D}${datadir}/aclocal/*
+       rm ${D}${datadir}/gettext/config.rpath
+       rm ${D}${datadir}/gettext/po/Makefile.in.in
+       rm ${D}${datadir}/gettext/po/remove-potcdate.sin
 }
 
 BBCLASSEXTEND = "native nativesdk"