From a4ad0703e1209fee6cd89bf74088931785c4d8c7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 16 Aug 2017 04:31:22 -0400 Subject: ncurses: 6.0+20161126 -> 6.0+20170715 Rebase patches: - tic-hang.patch -> 0001 - configure-reproducible.patch -> 0002 Drop fix-cflags-mangle.patch, which accepted by upstream ... commit 1b74f120ab7be89011408a6ad0f1c748a314bae8 Author: Sven Joachim Date: Sun Feb 26 09:01:34 2017 +0100 Import upstream patch 20170225 20170225 + fixes for CF_CC_ENV_FLAGS (report by Ross Burton). ... Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- .../recipes-core/ncurses/files/0001-tic-hang.patch | 43 ++++++++++++++++++++++ .../files/0002-configure-reproducible.patch | 35 ++++++++++++++++++ .../ncurses/files/configure-reproducible.patch | 20 ---------- .../ncurses/files/fix-cflags-mangle.patch | 18 --------- meta/recipes-core/ncurses/files/tic-hang.patch | 27 -------------- meta/recipes-core/ncurses/ncurses_6.0+20161126.bb | 12 ------ meta/recipes-core/ncurses/ncurses_6.0+20170715.bb | 11 ++++++ 7 files changed, 89 insertions(+), 77 deletions(-) create mode 100644 meta/recipes-core/ncurses/files/0001-tic-hang.patch create mode 100644 meta/recipes-core/ncurses/files/0002-configure-reproducible.patch delete mode 100644 meta/recipes-core/ncurses/files/configure-reproducible.patch delete mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch delete mode 100644 meta/recipes-core/ncurses/files/tic-hang.patch delete mode 100644 meta/recipes-core/ncurses/ncurses_6.0+20161126.bb create mode 100644 meta/recipes-core/ncurses/ncurses_6.0+20170715.bb (limited to 'meta/recipes-core/ncurses') diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch new file mode 100644 index 0000000000..4a970561d7 --- /dev/null +++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch @@ -0,0 +1,43 @@ +From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 16 Aug 2017 14:31:51 +0800 +Subject: [PATCH 1/2] tic hang + +Upstream-Status: Inappropriate [configuration] + +'tic' of some linux distributions (e.g. fedora 11) hang in an infinite +loop when processing the original file. + +Signed-off-by: anonymous + +Rebase to 6.0+20170715 +Signed-off-by: Hongxu Jia +--- + misc/terminfo.src | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/misc/terminfo.src b/misc/terminfo.src +index ee3fab3..176d593 100644 +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -5177,12 +5177,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 + # 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, +-- +1.8.3.1 + diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch new file mode 100644 index 0000000000..c47ce6a8cb --- /dev/null +++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch @@ -0,0 +1,35 @@ +From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 16 Aug 2017 14:45:27 +0800 +Subject: [PATCH 2/2] configure: reproducible + +"configure" enforces -U for ar flags, breaking deterministic builds. +The flag was added to fix some vaguely specified "recent POSIX binutil +build problems" in 2015. + +Upstream-Status: Pending +Signed-off-by: Juro Bystricky + +Rebase to Rebase to 6.0+20170715 + +Signed-off-by: Hongxu Jia +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 7d7d2c1..f444354 100755 +--- a/configure ++++ b/configure +@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then + else + + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +-- +1.8.3.1 + diff --git a/meta/recipes-core/ncurses/files/configure-reproducible.patch b/meta/recipes-core/ncurses/files/configure-reproducible.patch deleted file mode 100644 index 54a8bdc6b8..0000000000 --- a/meta/recipes-core/ncurses/files/configure-reproducible.patch +++ /dev/null @@ -1,20 +0,0 @@ -"configure" enforces -U for ar flags, breaking deterministic builds. -The flag was added to fix some vaguely specified "recent POSIX binutil -build problems" in 2015. - -Upstream-Status: Pending -Signed-off-by: Juro Bystricky - -diff --git a/configure b/configure -index 7f31208..aa80911 100755 ---- a/configure -+++ b/configure -@@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then - else - - cf_cv_ar_flags=unknown -- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv -+ for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv - do - - # check if $ARFLAGS already contains this choice diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch deleted file mode 100644 index e9447c5b81..0000000000 --- a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch +++ /dev/null @@ -1,18 +0,0 @@ -configure has a piece of logic to detect users "abusing" CC to hold compiler -flags (which we do). It also has logic to "correct" this by moving the flags -from CC to CFLAGS, but the sed only handles a single argument in CC. - -Replace the sed with awk to filter out all words that start with a hyphen. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/configure b/configure -index 7f31208..1a29cfc 100755 ---- a/configure -+++ b/configure -@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C -- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` -- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'` -+ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'` -+ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'` diff --git a/meta/recipes-core/ncurses/files/tic-hang.patch b/meta/recipes-core/ncurses/files/tic-hang.patch deleted file mode 100644 index cba89d26f5..0000000000 --- a/meta/recipes-core/ncurses/files/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+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb deleted file mode 100644 index ace3108007..0000000000 --- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ncurses.inc - -SRC_URI += "file://tic-hang.patch \ - file://fix-cflags-mangle.patch \ - file://config.cache \ - file://configure-reproducible.patch \ -" -# commit id corresponds to the revision in package version -SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" -S = "${WORKDIR}/git" -EXTRA_OECONF += "--with-abi-version=5" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb new file mode 100644 index 0000000000..127394c006 --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb @@ -0,0 +1,11 @@ +require ncurses.inc + +SRC_URI += "file://0001-tic-hang.patch \ + file://0002-configure-reproducible.patch \ + file://config.cache \ +" +# commit id corresponds to the revision in package version +SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87" +S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- cgit 1.2.3-korg