From 711677cf6b3c560d10729de789e0dd8de86ac43a Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Tue, 30 Aug 2022 06:33:48 -0400
Subject: [PATCH] ncurses should be fixed, thanks in part to CoreELEC.

---
 packages/devel/ncurses/package.mk   | 20 +++++++++++++++-----
 packages/tools/procps-ng/package.mk | 14 +++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
index a375d9e10..f96984e42 100644
--- a/packages/devel/ncurses/package.mk
+++ b/packages/devel/ncurses/package.mk
@@ -3,10 +3,10 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ncurses"
-PKG_VERSION="6.3-20220827"
+PKG_VERSION="6.3"
 PKG_LICENSE="MIT"
 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_TARGET="toolchain zlib ncurses:host"
 PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
@@ -47,7 +47,7 @@ PKG_CONFIGURE_OPTS_TARGET="
                            --disable-sigwinch \
                            --enable-pc-files \
                            --with-pkg-config-libdir=/usr/lib/pkgconfig \
-                           --disable-tcap-names \
+                           --enable-tcap-names \
                            --without-develop \
                            --disable-hard-tabs \
                            --disable-xmc-glitch \
@@ -57,7 +57,7 @@ PKG_CONFIGURE_OPTS_TARGET="
                            --enable-widec \
                            --disable-echo \
                            --disable-warnings \
-                           --disable-home-terminfo \
+                           --enable-home-terminfo \
                            --enable-lib-suffixes \
                            --disable-assertions"
 
@@ -69,7 +69,17 @@ PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
                          --without-manpages"
 
 post_makeinstall_target() {
+  local f
   cp misc/ncurses-config ${TOOLCHAIN}/bin
   chmod +x ${TOOLCHAIN}/bin/ncurses-config
-  sed -e "s:\(['=\" ]\)/usr:\\1${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 -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
 }
diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk
index 3b91e9ff6..cd6f48a20 100644
--- a/packages/tools/procps-ng/package.mk
+++ b/packages/tools/procps-ng/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="procps-ng"
-PKG_VERSION="3.3.15"
-PKG_SHA256="191391fde24a1d3b9b0030d26f8dfdcbf641d36297aab7ecf2f941c5ca927e21"
+PKG_VERSION="3.3.17"
+PKG_SHA256="8374d281f91e5fc9bb9ea8dc991b25331e3a2b0299b46f22c633f7fb6bcb0764"
 PKG_LICENSE="GPL"
 PKG_SITE="https://gitlab.com/procps-ng/procps"
 PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2"
@@ -20,12 +20,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
 
 PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc"
 
-PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA"
+PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-proc_libprocps_la_includeHEADERS"
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp -P $PKG_BUILD/.$TARGET_NAME/free $INSTALL/usr/bin
-    cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/free ${INSTALL}/usr/bin
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/top/top ${INSTALL}/usr/bin
 
-  make DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET
+  make DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET}
 }