diff --git a/distributions/JELOS/options b/distributions/JELOS/options index fbde73174..ccfb987ef 100644 --- a/distributions/JELOS/options +++ b/distributions/JELOS/options @@ -119,7 +119,7 @@ OEM_SUPPORT="no" # build and install nano text editor (yes / no) - NANO_EDITOR="yes" + NANO_EDITOR="no" # cron support (yes / no) CRON_SUPPORT="yes" diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk index 4afed712f..0e0456c1e 100644 --- a/packages/devel/readline/package.mk +++ b/packages/devel/readline/package.mk @@ -17,6 +17,10 @@ PKG_CONFIGURE_OPTS_TARGET="bash_cv_wcwidth_broken=no \ --disable-static \ --with-curses" +pre_configure_target() { + export LDFLAGS="${LDFLAGS} -lncurses -ltinfo" +} + post_makeinstall_target() { sed -i 's/-lreadline/-lreadline -lncursesw -ltinfo/' ${SYSROOT_PREFIX}/usr/lib/pkgconfig/readline.pc diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index 478893b09..88accdc5a 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nano" -PKG_VERSION="4.3" -PKG_SHA256="00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81" +PKG_VERSION="6.4" +PKG_SHA256="4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0" PKG_LICENSE="GPL" -PKG_SITE="http://www.nano-editor.org/" -PKG_URL="http://ftpmirror.gnu.org/nano/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_SITE="https://www.nano-editor.org/" +PKG_URL="https://www.nano-editor.org/dist/v6/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Nano is an enhanced clone of the Pico text editor." @@ -22,7 +22,7 @@ post_makeinstall_target() { mkdir -p ${INSTALL}/etc cp -a ${PKG_DIR}/config/* ${INSTALL}/etc/ - mkdir -p ${INSTALL}/usr/share/nano + mkdir -p ${INSTALL}/usr/share/nano for FILE_TYPES in \ css \ html \