Upgrade to ncurses 6.3

Disable tests while building ncurses
rkitover · May 10, 2022 · a803a8a · a803a8a
1 parent a09da08
commit a803a8a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/build_nano-win.sh b/build_nano-win.sh
@@ -8,29 +8,30 @@ _prefix="${_pwd}/pkg_${_host}"
 
 ./autogen.sh
 
-export CPPFLAGS="-D__USE_MINGW_ANSI_STDIO -DHAVE_NCURSESW_NCURSES_H  \
+export CPPFLAGS="-D__USE_MINGW_ANSI_STDIO -DHAVE_NCURSESW_NCURSES_H -DNCURSES_STATIC  \
                  -I\"${_prefix}/include\" -I\"${_prefix}/include/ncursesw\""
 export CFLAGS="-O2 -g3"
-export LDFLAGS="-O2 -L\"${_prefix}/lib/\""
+export LDFLAGS="-O2 -L\"${_prefix}/lib/\" -static"
+export LIBS="-lshlwapi -lbcrypt"
 
 export PKG_CONFIG="true"  # Force it to succeed.
 export CURSES_LIB_NAME="ncursesw"
 export CURSES_LIB="-lncursesw"
 
-wget -c "https://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz"
-tar -xzvf ncurses-6.2.tar.gz
-patch -p1 < ncurses-6.2.patch
+wget -c "https://invisible-mirror.net/archives/ncurses/ncurses-6.3.tar.gz"
+tar -xzvf ncurses-6.3.tar.gz
+patch -p1 < ncurses-6.3.patch
 
 mkdir -p "${_pwd}/build_${_host}"
 pushd "${_pwd}/build_${_host}"
 
 mkdir -p "ncurses"
 pushd "ncurses"
-../../ncurses-6.2/configure --host="${_host}" --prefix="${_prefix}"  \
+../../ncurses-6.3/configure --host="${_host}" --prefix="${_prefix}"  \
   --without-ada --without-cxx-binding --disable-db-install --without-manpages  \
   --without-pthread --without-debug --enable-widec --disable-database  \
   --disable-rpath --enable-termcap --disable-home-terminfo --enable-sp-funcs  \
-  --enable-term-driver --enable-static --disable-shared
+  --enable-term-driver --enable-static --disable-shared --without-tests
 make -j"${_nproc}"
 make install
 popd
@@ -40,7 +41,7 @@ pushd "nano"
 touch roll-a-release.sh  # Lie to configure.ac to make use of `git describe`.
 ../../configure --host="${_host}" --prefix="${_prefix}" --enable-nanorc  \
   --enable-color --disable-utf8 --disable-nls --disable-speller  \
-  --disable-threads --disable-rpath LIBS="-lshlwapi -lbcrypt"
+  --disable-threads --disable-rpath
 make -j"${_nproc}"
 make install-strip
 popd
diff --git a/ncurses-6.2.patch → ncurses-6.3.patch b/ncurses-6.2.patch → ncurses-6.3.patch
@@ -1,8 +1,8 @@
-diff --git a/ncurses-6.2.orig/ncurses/win32con/win_driver.c b/ncurses-6.2/ncurses/win32con/win_driver.c
-index 280aa6dc..e79ff7f4 100644
---- a/ncurses-6.2.orig/ncurses/win32con/win_driver.c
-+++ b/ncurses-6.2/ncurses/win32con/win_driver.c
-@@ -625,25 +625,9 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
+diff --git a/ncurses-6.3.orig/ncurses/win32con/win_driver.c b/ncurses-6.3/ncurses/win32con/win_driver.c
+index ad9e629a1..909e2efba 100644
+--- a/ncurses-6.3.orig/ncurses/win32con/win_driver.c
++++ b/ncurses-6.3/ncurses/win32con/win_driver.c
+@@ -623,25 +623,9 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 
      TCB->magic = WINMAGIC;