mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-30 12:00:41 +00:00
ncurses: build ncursesw for UTF-8 support
- update to 6.3 - Update patches 001 (terminfo xterm) and 002 (alloc fallback) - add patch 003: fix USE_SCROLL_HINTS/USE_HASHMAP logic - add patch 004: fix configure option --with-pkg-config-libdir is broken for cross compilation - Add symbolic links of ncursesw to common ncurses lib and header files to allow all packages to be build.
This commit is contained in:
parent
53a5e7f589
commit
4fa3e0ef44
@ -3,15 +3,14 @@
|
|||||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="ncurses"
|
PKG_NAME="ncurses"
|
||||||
PKG_VERSION="6.1-20181215"
|
PKG_VERSION="6.3"
|
||||||
PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
|
PKG_SHA256="97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059"
|
||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
PKG_SITE="http://www.gnu.org/software/ncurses/"
|
PKG_SITE="http://www.gnu.org/software/ncurses/"
|
||||||
PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-${PKG_VERSION}.tgz"
|
PKG_URL="http://invisible-mirror.net/archives/ncurses/ncurses-${PKG_VERSION}.tar.gz"
|
||||||
PKG_DEPENDS_HOST="ccache:host"
|
PKG_DEPENDS_HOST="ccache:host"
|
||||||
PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
|
PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
|
||||||
PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
|
PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
|
||||||
# causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
|
|
||||||
PKG_BUILD_FLAGS="+pic"
|
PKG_BUILD_FLAGS="+pic"
|
||||||
|
|
||||||
PKG_CONFIGURE_OPTS_TARGET="--without-ada \
|
PKG_CONFIGURE_OPTS_TARGET="--without-ada \
|
||||||
@ -54,11 +53,12 @@ PKG_CONFIGURE_OPTS_TARGET="--without-ada \
|
|||||||
--disable-hashmap \
|
--disable-hashmap \
|
||||||
--disable-safe-sprintf \
|
--disable-safe-sprintf \
|
||||||
--disable-scroll-hints \
|
--disable-scroll-hints \
|
||||||
--disable-widec \
|
--enable-widec \
|
||||||
--disable-echo \
|
--disable-echo \
|
||||||
--disable-warnings \
|
--disable-warnings \
|
||||||
--disable-home-terminfo \
|
--disable-home-terminfo \
|
||||||
--disable-assertions"
|
--disable-assertions \
|
||||||
|
--enable-leaks"
|
||||||
|
|
||||||
PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
|
PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
|
||||||
--with-termlib \
|
--with-termlib \
|
||||||
@ -67,9 +67,17 @@ PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
|
|||||||
--without-manpages"
|
--without-manpages"
|
||||||
|
|
||||||
post_makeinstall_target() {
|
post_makeinstall_target() {
|
||||||
|
local f
|
||||||
cp misc/ncurses-config ${TOOLCHAIN}/bin
|
cp misc/ncurses-config ${TOOLCHAIN}/bin
|
||||||
chmod +x ${TOOLCHAIN}/bin/ncurses-config
|
chmod +x ${TOOLCHAIN}/bin/ncurses-config
|
||||||
sed -e "s:\(['=\" ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/ncurses-config
|
sed -e "s:\(['=\" ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/ncurses-config
|
||||||
rm -f ${TOOLCHAIN}/bin/ncurses6-config
|
rm -f ${TOOLCHAIN}/bin/ncurses6-config
|
||||||
rm -rf ${INSTALL}/usr/bin
|
rm -rf ${INSTALL}/usr/bin
|
||||||
|
# create links to be compatible with any ncurses include path and lib names
|
||||||
|
ln -sf . ${SYSROOT_PREFIX}/usr/include/ncursesw
|
||||||
|
ln -sf . ${SYSROOT_PREFIX}/usr/include/ncurses
|
||||||
|
for f in form menu ncurses panel; do
|
||||||
|
ln -sf lib${f}w.a ${SYSROOT_PREFIX}/usr/lib/lib${f}.a
|
||||||
|
ln -sf ${f}w.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig/${f}.pc
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
|
|
||||||
Remove recent xterm terminfo features to be compatible with other emulations
|
Remove recent xterm terminfo features to be compatible with other emulations
|
||||||
|
|
||||||
--- a/misc/terminfo.src 2018-12-21 18:53:11.000000000 +0100
|
--- a/misc/terminfo.src 2021-03-20 22:45:39.000000000 +0100
|
||||||
+++ a/misc/terminfo.src 2018-12-22 22:56:47.000000000 +0100
|
+++ b/misc/terminfo.src 2021-06-01 23:53:10.335516419 +0200
|
||||||
@@ -4335,8 +4335,8 @@ xterm-xfree86|xterm terminal emulator (X
|
@@ -4808,8 +4808,8 @@ xterm-xfree86|xterm terminal emulator (X
|
||||||
xterm-new|modern xterm terminal emulator,
|
xterm+nofkeys|building block for xterm fkey-variants,
|
||||||
npc,
|
npc,
|
||||||
indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
|
kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
|
||||||
- rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout,
|
- use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm,
|
||||||
- use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
|
- use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
|
||||||
+ rin=\E[%p1%dT, use=ecma+strikeout,
|
+ use=ecma+strikeout, use=vt420+lrmm,
|
||||||
+ use=xterm+sm+1005, use=xterm+pcfkeys, use=xterm+tmux,
|
+ use=xterm+sm+1005, use=xterm+tmux, use=ecma+italics,
|
||||||
use=xterm-basic,
|
use=xterm+keypad, use=xterm-basic,
|
||||||
|
|
||||||
# This fragment is for people who cannot agree on what the backspace key
|
# This version reflects the current xterm features.
|
||||||
|
@ -1,19 +1,8 @@
|
|||||||
Fix freeing not allocated fallback entries by allocating a copy.
|
Fix freeing not allocated fallback entries by allocating a copy.
|
||||||
|
|
||||||
--- a/ncurses/tinfo/lib_setup.c 2018-11-24 23:13:16.000000000 +0100
|
|
||||||
+++ b/ncurses/tinfo/lib_setup.c 2018-12-29 10:31:01.000000000 +0100
|
|
||||||
@@ -756,6 +756,8 @@ TINFO_SETUP_TERM(TERMINAL **tp,
|
|
||||||
if (status != TGETENT_YES) {
|
|
||||||
const TERMTYPE2 *fallback = _nc_fallback2(tname);
|
|
||||||
|
|
||||||
+ if (fallback)
|
|
||||||
+ fallback = _nc_copy_entry(fallback);
|
|
||||||
if (fallback) {
|
|
||||||
T(("found fallback entry"));
|
|
||||||
TerminalType(termp) = *fallback;
|
|
||||||
--- a/ncurses/tinfo/tinfo_driver.c 2018-11-24 23:17:03.000000000 +0100
|
--- a/ncurses/tinfo/tinfo_driver.c 2018-11-24 23:17:03.000000000 +0100
|
||||||
+++ b/ncurses/tinfo/tinfo_driver.c 2018-12-29 10:27:19.000000000 +0100
|
+++ b/ncurses/tinfo/tinfo_driver.c 2018-12-29 10:27:19.000000000 +0100
|
||||||
@@ -172,6 +172,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * T
|
@@ -180,6 +180,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * T
|
||||||
if (status != TGETENT_YES) {
|
if (status != TGETENT_YES) {
|
||||||
const TERMTYPE2 *fallback = _nc_fallback2(tname);
|
const TERMTYPE2 *fallback = _nc_fallback2(tname);
|
||||||
|
|
||||||
|
18
packages/devel/ncurses/patches/ncurses-003-fix_hints.patch
Normal file
18
packages/devel/ncurses/patches/ncurses-003-fix_hints.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
Fix USE_SCROLL_HINTS/USE_HASHMAP logic
|
||||||
|
|
||||||
|
--- a/ncurses/curses.priv.h 2018-12-16 02:16:58.000000000 +0100
|
||||||
|
+++ a/ncurses/curses.priv.h 2021-05-30 00:12:14.086528124 +0200
|
||||||
|
@@ -258,10 +258,9 @@ extern NCURSES_EXPORT(void *) _nc_memmov
|
||||||
|
/*
|
||||||
|
* Scroll hints are useless when hashmap is used
|
||||||
|
*/
|
||||||
|
-#if !USE_SCROLL_HINTS
|
||||||
|
-#if !USE_HASHMAP
|
||||||
|
-#define USE_SCROLL_HINTS 1
|
||||||
|
-#else
|
||||||
|
+#if USE_SCROLL_HINTS
|
||||||
|
+#if USE_HASHMAP
|
||||||
|
+#undef USE_SCROLL_HINTS
|
||||||
|
#define USE_SCROLL_HINTS 0
|
||||||
|
#endif
|
||||||
|
#endif
|
@ -0,0 +1,13 @@
|
|||||||
|
Fix configure option --with-pkg-config-libdir is broken for cross compilation
|
||||||
|
|
||||||
|
--- a/configure 2021-10-17 17:12:23.000000000 +0200
|
||||||
|
+++ b/configure 2021-11-26 00:27:00.224815736 +0100
|
||||||
|
@@ -4229,7 +4229,7 @@ echo $ECHO_N "checking for first directo
|
||||||
|
cf_pkg_config_path=none
|
||||||
|
for cf_config in $cf_search_path
|
||||||
|
do
|
||||||
|
- if test -d "$cf_config"
|
||||||
|
+ if test -n "$cf_config"
|
||||||
|
then
|
||||||
|
cf_pkg_config_path=$cf_config
|
||||||
|
break
|
Loading…
Reference in New Issue
Block a user