[gnome-continuous-yocto/gnomeostree-3.14-dizzy] ncurses: Upgrade 4.9 stable to latest patchlevel 20150329

[Colin Walters <walters src gnome org>]

commit c894e5f26ecadb865636ef00dd61cb07297b89d0
Author: Khem Raj <raj khem gmail com>
Date:   Mon Apr 6 17:36:29 2015 +0000

    ncurses: Upgrade 4.9 stable to latest patchlevel 20150329
    
    gcc5 barfs on older release
    
    Change-Id: Ib1ad9b1cf7f16eb454da21fd61dc56fe1d9f6783
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/ncurses/ncurses.inc    |   14 ++++++++++++--
 meta/recipes-core/ncurses/ncurses_5.9.bb |    8 +++++---
 2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 521d0e4..88e5347 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses-config"
 inherit autotools binconfig-disabled multilib_header
 
 # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
-SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"
+SRC_URI = "ftp://invisible-island.net/${BPN}/current/${BP}-${REVISION}.tgz";
 
 EXTRA_AUTORECONF = "-I m4"
 CONFIG_SITE =+ "${WORKDIR}/config.cache"
@@ -97,12 +97,15 @@ do_configure() {
         # broken because it requires stdin to be pollable (which is
         # not the case for /dev/null redirections)
         export cf_cv_working_poll=yes
+       #Remove ${includedir} from CPPFLAGS, need for cross compile
+       sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS"
 
        ( cd ${S}; gnu-configize --force )
        ncurses_configure "narrowc" || \
                return 1
        ! ${ENABLE_WIDEC} || \
                ncurses_configure "widec" "--enable-widec" "--without-progs"
+
 }
 
 do_compile() {
@@ -229,7 +232,14 @@ do_install() {
             # At some point we can rely on coreutils 8.16 which has ln -r.
             lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
         fi
-
+        if [ -d "${D}${includedir}/ncurses" ]; then
+            for f in `find ${D}${includedir}/ncurses -name "*.h"`
+            do
+               f=`basename $f`
+               test -e ${D}${includedir}/$f && continue
+                ln -sf ncurses/$f ${D}${includedir}/$f
+            done
+        fi
         oe_multilib_header curses.h
 }
 
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_5.9.bb
index 6d23c0c..54d27a9 100644
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.9.bb
@@ -1,10 +1,12 @@
 require ncurses.inc
 
+REVISION = "20150329"
+
 PR = "${INC_PR}.1"
 
 SRC_URI += "file://tic-hang.patch \
             file://config.cache \
 "
-
-SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1"
-SRC_URI[sha256sum] = "9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b"
+S = "${WORKDIR}/${BP}-${REVISION}"
+SRC_URI[md5sum] = "cee991d09e69e60ebedef424804c52d4"
+SRC_URI[sha256sum] = "5b64f40e4dce73e3aa83d15bd9257c6eff8790ec41150f0938bd87c0eb75828f"