From b5593da4ce6302d9ccaef9fde52bf60a6d4a669b Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Thu, 26 Dec 2024 01:26:36 -0500
Subject: [PATCH] gnu-typist: update patch for 2.10 release

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 gnu-typist/2.10.patch  | 170 +++++++++++++++++++++++++++++++++++++++++
 gnu-typist/2.9.5.patch | 104 -------------------------
 2 files changed, 170 insertions(+), 104 deletions(-)
 create mode 100644 gnu-typist/2.10.patch
 delete mode 100644 gnu-typist/2.9.5.patch

diff --git a/gnu-typist/2.10.patch b/gnu-typist/2.10.patch
new file mode 100644
index 00000000..1065ddf4
--- /dev/null
+++ b/gnu-typist/2.10.patch
@@ -0,0 +1,170 @@
+diff --git a/configure b/configure
+index 06a8497..cffea20 100755
+--- a/configure
++++ b/configure
+@@ -6380,7 +6380,7 @@ fi
+ done
+ 
+ 
+-# check for libncursesw
++# check for libncurses
+ case $host_os in
+   *bsd* | darwin*)
+ 
+@@ -6395,14 +6395,14 @@ else
+ fi
+ 
+ 
+-    # check for libncursesw
++    # check for libncurses
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncursesw" >&5
+ $as_echo_n "checking for add_wch in -lncursesw... " >&6; }
+ if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncursesw  $LIBS"
++LIBS="-lncurses  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6437,7 +6437,7 @@ if test "x$ac_cv_lib_ncursesw_add_wch" = xyes; then :
+ #define HAVE_LIBNCURSESW 1
+ _ACEOF
+ 
+-  LIBS="-lncursesw $LIBS"
++  LIBS="-lncurses $LIBS"
+ 
+ else
+   as_fn_error $? "ncursesw library is missing: See INSTALL file for further information" "$LINENO" 5
+@@ -6445,7 +6445,7 @@ fi
+ 
+     ;;
+   *)
+-    ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
++    ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
+ if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
+   HAVE_NCURSESW_H=1
+ fi
+@@ -6457,7 +6457,7 @@ if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncursesw  $LIBS"
++LIBS="-lncurses  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6492,7 +6492,7 @@ if test "x$ac_cv_lib_ncursesw_add_wch" = xyes; then :
+ fi
+ 
+     if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW";  then
+-       LIBS="-lncursesw $LIBS"
++       LIBS="-lncurses $LIBS"
+     else
+        echo -e "Error:  both library and header files for the ncursesw library\n"\
+            "are required to build this package.  See INSTALL file for"\
+diff --git a/src/banner.c b/src/banner.c
+index 88d6f6f..00d1df4 100644
+--- a/src/banner.c
++++ b/src/banner.c
+@@ -32,7 +32,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "gettext.h"
+diff --git a/src/cursmenu.c b/src/cursmenu.c
+index 11b2d83..f01a398 100644
+--- a/src/cursmenu.c
++++ b/src/cursmenu.c
+@@ -28,7 +28,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "error.h"
+diff --git a/src/error.c b/src/error.c
+index 87844e0..fb5e3e7 100644
+--- a/src/error.c
++++ b/src/error.c
+@@ -30,7 +30,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <stdlib.h>
+diff --git a/src/gtypist.c b/src/gtypist.c
+index fa46c67..0549fac 100644
+--- a/src/gtypist.c
++++ b/src/gtypist.c
+@@ -35,7 +35,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <time.h>
+diff --git a/src/infoview.c b/src/infoview.c
+index fc1c0ea..90470ad 100644
+--- a/src/infoview.c
++++ b/src/infoview.c
+@@ -29,7 +29,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "infoview.h"
+diff --git a/src/script.c b/src/script.c
+index faae023..a17f943 100644
+--- a/src/script.c
++++ b/src/script.c
+@@ -29,7 +29,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "error.h"
+diff --git a/src/speedbox.c b/src/speedbox.c
+index 72b8c52..a1a2082 100644
+--- a/src/speedbox.c
++++ b/src/speedbox.c
+@@ -26,7 +26,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "speedbox.h"
+diff --git a/src/utf8.c b/src/utf8.c
+index 9aa6325..45de2a3 100644
+--- a/src/utf8.c
++++ b/src/utf8.c
+@@ -26,7 +26,7 @@
+ #if defined(HAVE_PDCURSES) || defined(OS_BSD)
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <stdlib.h>
diff --git a/gnu-typist/2.9.5.patch b/gnu-typist/2.9.5.patch
deleted file mode 100644
index 6ed3a5de..00000000
--- a/gnu-typist/2.9.5.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/configure b/configure
-index 2207b09..915a664 100755
---- a/configure
-+++ b/configure
-@@ -6301,9 +6301,9 @@ fi
- done
-
-
--# check for libncursesw
-+# check for libncurses
-
--ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
-+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
- if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
-   HAVE_NCURSESW_H=1
- fi
-@@ -6315,7 +6315,7 @@ if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncursesw  $LIBS"
-+LIBS="-lncurses  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-
-@@ -6350,7 +6350,7 @@ if test "x$ac_cv_lib_ncursesw_add_wch" = xyes; then :
- fi
-
- if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW";  then
--   LIBS="-lncursesw $LIBS"
-+   LIBS="-lncurses $LIBS"
- else
-    echo -e "Error:  both library and header files for the ncursesw library\n"\
-        "are required to build this package.  See INSTALL file for"\
-@@ -10553,4 +10553,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
-diff --git a/src/cursmenu.c b/src/cursmenu.c
-index 1c3990e..f0fc21a 100644
---- a/src/cursmenu.c
-+++ b/src/cursmenu.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-diff --git a/src/error.c b/src/error.c
-index 2022f2b..4ab6741 100644
---- a/src/error.c
-+++ b/src/error.c
-@@ -25,7 +25,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>
-diff --git a/src/gtypist.c b/src/gtypist.c
-index bd5af8d..b634325 100644
---- a/src/gtypist.c
-+++ b/src/gtypist.c
-@@ -31,7 +31,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <time.h>
-diff --git a/src/script.c b/src/script.c
-index ce04d68..f4032e2 100644
---- a/src/script.c
-+++ b/src/script.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include "error.h"
-diff --git a/src/utf8.c b/src/utf8.c
-index 8eab3d3..e3194df 100644
---- a/src/utf8.c
-+++ b/src/utf8.c
-@@ -23,7 +23,7 @@
- #ifdef HAVE_PDCURSES
- #include <curses.h>
- #else
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #endif
-
- #include <stdlib.h>