forked from buildroot/buildroot
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update ncurses 5.9 -> 6.1 (buildroot#32)
* Update ncurses from upstream * ncurses: Update for old buildroot compatibility * ncurses: Add st-256color terminfo Used by the ST-SDL application
- Loading branch information
Showing
8 changed files
with
168 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
Fix gcc 5.x build failure | ||
|
||
Extracted from upstream commit | ||
http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. | ||
|
||
+ modify MKlib_gen.sh to work around change in development version of | ||
gcc introduced here: | ||
https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html | ||
https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html | ||
(reports by Marcus Shawcroft, Maohui Lei). | ||
|
||
Original author: Thomas E. Dickey <dickey@invisible-island.net> | ||
Signed-off-by: Mikhail Peselnik <bas@bmail.ru> | ||
[Adam Duskett: Refresh for 6.1] | ||
Signed-off-by: Adam Duskett <aduskett@gmail.com> | ||
--- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 | ||
+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 | ||
@@ -505,11 +505,22 @@ | ||
-e 's/gen_$//' \ | ||
-e 's/ / /g' >>$TMP | ||
|
||
+cat >$ED1 <<EOF | ||
+s/ / /g | ||
+s/^ // | ||
+s/ $// | ||
+s/P_NCURSES_BOOL/NCURSES_BOOL/g | ||
+EOF | ||
+ | ||
+# A patch discussed here: | ||
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html | ||
+# introduces spurious #line markers. Work around that by ignoring the system's | ||
+# attempt to define "bool" and using our own symbol here. | ||
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 | ||
+cat $ED2 >$TMP | ||
+ | ||
$preprocessor $TMP 2>/dev/null \ | ||
-| sed \ | ||
- -e 's/ / /g' \ | ||
- -e 's/^ //' \ | ||
- -e 's/_Bool/NCURSES_BOOL/g' \ | ||
+| sed -f $ED1 \ | ||
| $AWK -f $AW2 \ | ||
| sed -f $ED3 \ | ||
| sed \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,34 @@ | ||
config BR2_PACKAGE_NCURSES | ||
bool "ncurses" | ||
help | ||
The Ncurses (new curses) library is a free software emulation of | ||
curses in System V Release 4.0, and more. | ||
The Ncurses (new curses) library is a free software | ||
emulation of curses in System V Release 4.0, and more. | ||
|
||
This package installs only a few vital termcap entries | ||
|
||
http://www.gnu.org/software/ncurses/ | ||
|
||
if BR2_PACKAGE_NCURSES | ||
|
||
config BR2_PACKAGE_NCURSES_TARGET_PANEL | ||
bool "ncurses libpanel in target" | ||
config BR2_PACKAGE_NCURSES_WCHAR | ||
bool "enable wide char support" | ||
depends on BR2_USE_WCHAR | ||
help | ||
Includes ncurses dynamic libpanel in target | ||
Enable wide char & UTF-8 support in ncurses libraries | ||
|
||
config BR2_PACKAGE_NCURSES_TARGET_FORM | ||
bool "ncurses libform in target" | ||
config BR2_PACKAGE_NCURSES_TARGET_PROGS | ||
bool "ncurses programs" | ||
help | ||
Includes ncurses dynamic libform in target | ||
Include ncurses programs in target (clear, reset, tput, ...) | ||
|
||
config BR2_PACKAGE_NCURSES_TARGET_MENU | ||
bool "ncurses libmenu in target" | ||
config BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO | ||
string "additional terminfo files to install" | ||
help | ||
Includes ncurses dynamic libmenu in target | ||
Whitespace separated list of terminfo files to install on the | ||
target. A small number of vital terminfo files are always | ||
installed. This list is in addition to the vital ones. | ||
|
||
config BR2_PACKAGE_NCURSES_TARGET_PROGS | ||
bool "ncurses programs" | ||
help | ||
Include ncurses programs in traget (clear, reset, tput, ...) | ||
The terminfo filenames should have the single letter path | ||
prefix. e.g. t/tmux. | ||
|
||
endif |
This file was deleted.
Oops, something went wrong.
89 changes: 0 additions & 89 deletions
89
package/ncurses/ncurses-01-fixup-pkg-config-handling.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Locally calculated after checking pgp signature | ||
sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz | ||
# Locally computed | ||
sha256 86106f0da1cf5ccfa0f0651665dd1b4515e8edad1c7972780155770548b317d9 COPYING |
Oops, something went wrong.