speech-tools: fix build with gcc15

This commit is contained in:
Xiangyan Sun
2026-05-03 11:36:16 -07:00
parent db985dfa6e
commit c0bbffa071
2 changed files with 48 additions and 0 deletions
@@ -0,0 +1,46 @@
diff --git a/siod/editline.c b/siod/editline.c
index 6a1b847..964fe5e 100644
--- a/siod/editline.c
+++ b/siod/editline.c
@@ -176,7 +176,7 @@ STATIC STATUS h_next();
STATIC STATUS h_prev();
STATIC STATUS h_first();
STATIC STATUS h_last();
-STATIC int substrcmp(char *text, char *pat, int len);
+STATIC int substrcmp(const char *text, const char *pat, size_t len);
STATIC ECHAR *search_hist(ECHAR *search, ECHAR *(*move)());
STATIC STATUS h_search();
STATIC STATUS fd_char();
@@ -224,10 +224,10 @@ int rl_meta_chars = 0;
*/
STATIC ECHAR *editinput();
#if defined(USE_TERMCAP)
-extern char *getenv();
-extern char *tgetstr();
-extern int tgetent();
-extern int tgetnum();
+extern char *getenv(const char *);
+extern char *tgetstr(char *, char **);
+extern int tgetent(char *, const char *);
+extern int tgetnum(char *);
#endif /* defined(USE_TERMCAP) */
/*
@@ -806,7 +806,7 @@ STATIC STATUS h_last()
/*
** Return zero if pat appears as a substring in text.
*/
-STATIC int substrcmp(char *text, char *pat, int len)
+STATIC int substrcmp(const char *text, const char *pat, size_t len)
{
ECHAR c;
@@ -823,7 +823,7 @@ STATIC ECHAR *search_hist(ECHAR *search, ECHAR *(*move)())
static ECHAR *old_search;
int len;
int pos;
- int (*match)();
+ int (*match)(const char *, const char *, size_t);
char *pat;
/* Save or get remembered search pattern. */
+2
View File
@@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/festvox/speech_tools/commit/06141f69d21bf507a9becb5405265dc362edb0df.patch";
hash = "sha256-tRestCBuRhak+2ccsB6mvDxGm/TIYX4eZ3oppCOEP9s=";
})
# Fix C23 compatibility: https://github.com/festvox/speech_tools/pull/58
./fix-c23.patch
];
buildInputs = [