From 743e97cc80744ca88d72b8db0ee95bb58f350ef9 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Fri, 15 Jan 2016 00:09:10 -0500 Subject: ncurses: 5.9 0 -> 6.0 To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF Signed-off-by: Dengke Du Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses-5.9/config.cache | 4 ---- .../ncurses/ncurses-5.9/tic-hang.patch | 27 ---------------------- meta/recipes-core/ncurses/ncurses-6.0/config.cache | 4 ++++ .../ncurses/ncurses-6.0/tic-hang.patch | 27 ++++++++++++++++++++++ meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/ncurses_5.9.bb | 12 ---------- meta/recipes-core/ncurses/ncurses_6.0.bb | 11 +++++++++ 7 files changed, 42 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-core/ncurses/ncurses-5.9/config.cache delete mode 100644 meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch create mode 100644 meta/recipes-core/ncurses/ncurses-6.0/config.cache create mode 100644 meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch delete mode 100644 meta/recipes-core/ncurses/ncurses_5.9.bb create mode 100644 meta/recipes-core/ncurses/ncurses_6.0.bb (limited to 'meta/recipes-core/ncurses') diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses-5.9/config.cache deleted file mode 100644 index 6a9217d5bb..0000000000 --- a/meta/recipes-core/ncurses/ncurses-5.9/config.cache +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -cf_cv_func_nanosleep=yes -cf_cv_func_mkstemp=yes diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch deleted file mode 100644 index cba89d26f5..0000000000 --- a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -'tic' of some linux distributions (e.g. fedora 11) hang in an infinite -loop when processing the original file. - -Index: ncurses-5.7/misc/terminfo.src -=================================================================== ---- ncurses-5.7.orig/misc/terminfo.src -+++ ncurses-5.7/misc/terminfo.src -@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key - # The value for kbs reflects local customization rather than the settings used - # for XFree86 xterm. - konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, -- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, -- use=konsole-vt100, --# Konsole does not implement shifted cursor-keys. --konsole+pcfkeys|konsole subset of xterm+pcfkeys, -- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, -- use=xterm+pcf0, -+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, -+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, -+ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, -+ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, -+ khome=\EOH, use=konsole-vt100, - # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but - # it is still useful for deriving the other entries. - konsole-vt100|KDE console window with vt100 (sic) keyboard, diff --git a/meta/recipes-core/ncurses/ncurses-6.0/config.cache b/meta/recipes-core/ncurses/ncurses-6.0/config.cache new file mode 100644 index 0000000000..6a9217d5bb --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses-6.0/config.cache @@ -0,0 +1,4 @@ +#! /bin/sh + +cf_cv_func_nanosleep=yes +cf_cv_func_mkstemp=yes diff --git a/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch new file mode 100644 index 0000000000..cba89d26f5 --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch @@ -0,0 +1,27 @@ +Upstream-Status: Inappropriate [configuration] + +'tic' of some linux distributions (e.g. fedora 11) hang in an infinite +loop when processing the original file. + +Index: ncurses-5.7/misc/terminfo.src +=================================================================== +--- ncurses-5.7.orig/misc/terminfo.src ++++ ncurses-5.7/misc/terminfo.src +@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key + # The value for kbs reflects local customization rather than the settings used + # for XFree86 xterm. + konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, +- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, +- use=konsole-vt100, +-# Konsole does not implement shifted cursor-keys. +-konsole+pcfkeys|konsole subset of xterm+pcfkeys, +- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, +- use=xterm+pcf0, ++ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, ++ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, ++ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, ++ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, ++ khome=\EOH, use=konsole-vt100, + # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but + # it is still useful for deriving the other entries. + konsole-vt100|KDE console window with vt100 (sic) keyboard, 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_5.9.bb deleted file mode 100644 index 22c6230ed7..0000000000 --- a/meta/recipes-core/ncurses/ncurses_5.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ncurses.inc - -REVISION = "20150329" - -PR = "${INC_PR}.1" - -SRC_URI += "file://tic-hang.patch \ - file://config.cache \ -" -# commit id corresponds to the above listed REVISION -SRCREV = "6286e14dac28811dbfd325b8d4c23f0d4e37eaf0" -S = "${WORKDIR}/git" diff --git a/meta/recipes-core/ncurses/ncurses_6.0.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb new file mode 100644 index 0000000000..8587287542 --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses_6.0.bb @@ -0,0 +1,11 @@ +require ncurses.inc + +REVISION = "20151024" + +SRC_URI += "file://tic-hang.patch \ + file://config.cache \ +" +# commit id corresponds to the above listed REVISION +SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522" +S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" -- cgit 1.2.3-korg