ncurses: 5.9 0 -> 6.0

To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF

(From OE-Core rev: 743e97cc80744ca88d72b8db0ee95bb58f350ef9)

Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 3 insertions, 5 deletions

diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses-6.0/config.cache
index 6a9217d5bb..6a9217d5bb 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/config.cache
+++ b/meta/recipes-core/ncurses/ncurses-6.0/config.cache
diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch
index cba89d26f5..cba89d26f5 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch
+++ b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 27815b8f5c..fbe74d5925 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_class-native = ""
-INC_PR = "r15"
 
 BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config"
 
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb
index 22c6230ed7..8587287542 100644
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0.bb
@@ -1,12 +1,11 @@
 require ncurses.inc
 
-REVISION = "20150329"
-
-PR = "${INC_PR}.1"
+REVISION = "20151024"
 
 SRC_URI += "file://tic-hang.patch \
             file://config.cache \
 "
 # commit id corresponds to the above listed REVISION
-SRCREV = "6286e14dac28811dbfd325b8d4c23f0d4e37eaf0"
+SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522"
 S = "${WORKDIR}/git"
+EXTRA_OECONF += "--with-abi-version=5"