mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

ncureses: 6.0+20171125 -> 6.1

Browse Source 
1. Rebase 0001, 0002

2. Fix [already-stripped] QA Issue
Since the following commit add, it strip executables which
are installed by default.
...
commit 087eaf92c621098927f3f98e3652411de48f8b6b
Author: Sven Joachim <svenjoac@gmx.de>
Date:   Sun Jan 21 08:01:41 2018 +0100

    Import upstream patch 20180120

    20180120
        + build-fix in picsmap.c for stdint.h existence.
        + add --disable-stripping option to configure scripts.
...

(From OE-Core rev: 09bc55eeb41a6e06438b35e5456c66198d549b92)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2018-03-30 02:46:28 -04:00
committed by Richard Purdie
parent f6cb244907
commit 401413579f
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/ncurses/files/0001-tic-hang.patch
+12 -12
View File
@@ -1,6 +1,6 @@
From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001 From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 16 Aug 2017 14:31:51 +0800 Date: Fri, 30 Mar 2018 10:02:24 +0800
Subject: [PATCH 1/2] tic hang Subject: [PATCH 1/2] tic hang
Upstream-Status: Inappropriate [configuration] Upstream-Status: Inappropriate [configuration]
@@ -10,34 +10,34 @@ loop when processing the original file.
Signed-off-by: anonymous Signed-off-by: anonymous
Rebase to 6.0+20170715 Rebase to 6.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
misc/terminfo.src | 11 +++++------ misc/terminfo.src | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-) 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/misc/terminfo.src b/misc/terminfo.src diff --git a/misc/terminfo.src b/misc/terminfo.src
index ee3fab3..176d593 100644 index 84f4810..6b385ec 100644
--- a/misc/terminfo.src --- a/misc/terminfo.src
+++ b/misc/terminfo.src +++ b/misc/terminfo.src
@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, @@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
# The value for kbs reflects local customization rather than the settings used # The value for kbs (see konsole-vt100) reflects local customization rather
# for XFree86 xterm. # than the settings used for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, - kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
- use=konsole-vt100, - use=konsole-vt100,
-# Konsole does not implement shifted cursor-keys. -
-konsole+pcfkeys|konsole subset of xterm+pcfkeys, -konsole+pcfkeys|konsole subset of xterm+pcfkeys,
- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, - kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0,
- use=xterm+pcf0, - use=xterm+pce2,
+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, + kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, + 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~, + 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, + kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
+ khome=\EOH, use=konsole-vt100, + khome=\EOH, use=konsole-vt100,
# Obsolete: vt100.keymap
# KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but # 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,
-- --
1.8.3.1 1.8.3.1
meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001 From 2a53c03ffa90f0050a949fc5920f0df3e668ff42 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 16 Aug 2017 14:45:27 +0800 Date: Wed, 16 Aug 2017 14:45:27 +0800
Subject: [PATCH 2/2] configure: reproducible Subject: [PATCH 2/2] configure: reproducible
@@ -10,7 +10,7 @@ build problems" in 2015.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Rebase to Rebase to 6.0+20170715 Rebase to 6.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
@@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure diff --git a/configure b/configure
index 7d7d2c1..f444354 100755 index adead92..fa4fdb7 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then @@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
else else
cf_cv_ar_flags=unknown cf_cv_ar_flags=unknown
meta/recipes-core/ncurses/ncurses.inc
+1
View File
@@ -87,6 +87,7 @@ ncurses_configure() {
--disable-rpath-hack \ --disable-rpath-hack \
${EXCONFIG_ARGS} \ ${EXCONFIG_ARGS} \
--with-manpage-format=normal \ --with-manpage-format=normal \
--disable-stripping \
"$@" || return 1 "$@" || return 1
cd .. cd ..
} }
meta/recipes-core/ncurses/ncurses_6.0+20171125.bb → meta/recipes-core/ncurses/ncurses_6.1.bb
+1 -1
View File
@@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \
file://config.cache \ file://config.cache \
" "
# commit id corresponds to the revision in package version # commit id corresponds to the revision in package version
SRCREV = "5d849e836052459901cfe0b85a0b2939ff8d2b2a" SRCREV = "518fe9f913a0bfb80f1e366c9fcccf23e79dc69b"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5" EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"