summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/ncurses/files/0001-tic-hang.patch24
-rw-r--r--meta/recipes-core/ncurses/files/0002-configure-reproducible.patch8
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc1
-rw-r--r--meta/recipes-core/ncurses/ncurses_6.1.bb (renamed from meta/recipes-core/ncurses/ncurses_6.0+20171125.bb)2
4 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
index 4a970561d7..f98a943e5c 100644
--- a/meta/recipes-core/ncurses/files/0001-tic-hang.patch
+++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
@@ -1,6 +1,6 @@
1From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001 1From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 14:31:51 +0800 3Date: Fri, 30 Mar 2018 10:02:24 +0800
4Subject: [PATCH 1/2] tic hang 4Subject: [PATCH 1/2] tic hang
5 5
6Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
@@ -10,34 +10,34 @@ loop when processing the original file.
10 10
11Signed-off-by: anonymous 11Signed-off-by: anonymous
12 12
13Rebase to 6.0+20170715 13Rebase to 6.1
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15--- 15---
16 misc/terminfo.src | 11 +++++------ 16 misc/terminfo.src | 11 +++++------
17 1 file changed, 5 insertions(+), 6 deletions(-) 17 1 file changed, 5 insertions(+), 6 deletions(-)
18 18
19diff --git a/misc/terminfo.src b/misc/terminfo.src 19diff --git a/misc/terminfo.src b/misc/terminfo.src
20index ee3fab3..176d593 100644 20index 84f4810..6b385ec 100644
21--- a/misc/terminfo.src 21--- a/misc/terminfo.src
22+++ b/misc/terminfo.src 22+++ b/misc/terminfo.src
23@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, 23@@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
24 # The value for kbs reflects local customization rather than the settings used 24 # The value for kbs (see konsole-vt100) reflects local customization rather
25 # for XFree86 xterm. 25 # than the settings used for XFree86 xterm.
26 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, 26 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
27- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, 27- kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
28- use=konsole-vt100, 28- use=konsole-vt100,
29-# Konsole does not implement shifted cursor-keys. 29-
30-konsole+pcfkeys|konsole subset of xterm+pcfkeys, 30-konsole+pcfkeys|konsole subset of xterm+pcfkeys,
31- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, 31- kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0,
32- use=xterm+pcf0, 32- use=xterm+pce2,
33+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, 33+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
34+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, 34+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
35+ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, 35+ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
36+ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, 36+ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
37+ khome=\EOH, use=konsole-vt100, 37+ khome=\EOH, use=konsole-vt100,
38
39 # Obsolete: vt100.keymap
38 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but 40 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
39 # it is still useful for deriving the other entries.
40 konsole-vt100|KDE console window with vt100 (sic) keyboard,
41-- 41--
421.8.3.1 421.8.3.1
43 43
diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
index c47ce6a8cb..572195611e 100644
--- a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
+++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
@@ -1,4 +1,4 @@
1From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001 1From 2a53c03ffa90f0050a949fc5920f0df3e668ff42 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 14:45:27 +0800 3Date: Wed, 16 Aug 2017 14:45:27 +0800
4Subject: [PATCH 2/2] configure: reproducible 4Subject: [PATCH 2/2] configure: reproducible
@@ -10,7 +10,7 @@ build problems" in 2015.
10Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> 11Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
12 12
13Rebase to Rebase to 6.0+20170715 13Rebase to 6.1
14 14
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16--- 16---
@@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/configure b/configure 20diff --git a/configure b/configure
21index 7d7d2c1..f444354 100755 21index adead92..fa4fdb7 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then 24@@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
25 else 25 else
26 26
27 cf_cv_ar_flags=unknown 27 cf_cv_ar_flags=unknown
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 01e41d5f73..99fc47869e 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -87,6 +87,7 @@ ncurses_configure() {
87 --disable-rpath-hack \ 87 --disable-rpath-hack \
88 ${EXCONFIG_ARGS} \ 88 ${EXCONFIG_ARGS} \
89 --with-manpage-format=normal \ 89 --with-manpage-format=normal \
90 --disable-stripping \
90 "$@" || return 1 91 "$@" || return 1
91 cd .. 92 cd ..
92} 93}
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb b/meta/recipes-core/ncurses/ncurses_6.1.bb
index 6c4b96f428..8d72f571d2 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.1.bb
@@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \
5 file://config.cache \ 5 file://config.cache \
6" 6"
7# commit id corresponds to the revision in package version 7# commit id corresponds to the revision in package version
8SRCREV = "5d849e836052459901cfe0b85a0b2939ff8d2b2a" 8SRCREV = "518fe9f913a0bfb80f1e366c9fcccf23e79dc69b"
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10EXTRA_OECONF += "--with-abi-version=5" 10EXTRA_OECONF += "--with-abi-version=5"
11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" 11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"