Accepting request 1303109 from KDE:KDE3

OBS-URL: https://build.opensuse.org/request/show/1303109
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/festival?expand=0&rev=47

festival.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Sep  8 03:36:35 UTC 2025 - Yasuhiko Kamata <belphegor@belbel.or.jp>
+
+- Added patch speech_tools-substrcmp-size_t.patch to fix a
+  build failure in Tumbleweed/i586 (because "long unsigned int"
+  != size_t).
+
+-------------------------------------------------------------------
+Tue Jul  1 00:23:42 UTC 2025 - Yasuhiko Kamata <belphegor@belbel.or.jp>
+
+- Added patch speech_tools-remove-externs.patch to remove
+  unnecessary external decls and add required header.
+- Added patch speech_tools-explicit-func-match.patch to resolve
+  function definition issues
+  (Abve two fixes resolve a compilation failure in Tumbleweed,
+   but it's also useful in other versions, so it applies
+   regardless of version).
+
 -------------------------------------------------------------------
 Sat Aug 24 01:06:24 UTC 2024 - Yasuhiko Kamata <belphegor@belbel.or.jp>
 

festival.spec

@@ -61,6 +61,9 @@ Patch19:        speech_tools-null-fragile.patch
 Patch20:        festival-null-fragile.patch
 # PATCH-FIX-OPENSUSE festival-configure-c99.patch -- fix prototype in configure tests.
 Patch21:        festival-configure-c99.patch
+Patch22:        speech_tools-remove-externs.patch
+Patch23:        speech_tools-explicit-func-match.patch
+Patch24:        speech_tools-substrcmp-size_t.patch
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
@@ -108,9 +111,14 @@ cd ../speech_tools
 cd ../festival
 %patch -P 20 -p1
 %patch -P 21 -p1
+cd ../speech_tools
+%patch -P 22 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+export CFLAGS="$CFLAGS -std=gnu89"
 %if 0%{?suse_version} > 1600
 autoconf -f
 %endif

speech_tools-explicit-func-match.patch

@@ -0,0 +1,30 @@
+diff -Naru speech_tools_orig/siod/editline.c speech_tools/siod/editline.c
+--- speech_tools_orig/siod/editline.c	2025-07-01 09:07:39.174350577 +0900
++++ speech_tools/siod/editline.c	2025-07-01 09:16:17.654869747 +0900
+@@ -176,7 +176,7 @@
+ 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, long unsigned int len);
+ STATIC ECHAR *search_hist(ECHAR *search, ECHAR *(*move)());
+ STATIC STATUS h_search();
+ STATIC STATUS fd_char();
+@@ -792,7 +792,7 @@
+ /*
+ **  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, long unsigned int len)
+ {
+     ECHAR	c;
+ 
+@@ -809,7 +809,7 @@
+     static ECHAR	*old_search;
+     int		len;
+     int		pos;
+-    int		(*match)();
++    int		(*match)(const char *, const char *, long unsigned int);
+     char	*pat;
+ 
+     /* Save or get remembered search pattern. */

speech_tools-remove-externs.patch

@@ -0,0 +1,24 @@
+diff -Naru speech_tools_orig/siod/editline.c speech_tools/siod/editline.c
+--- speech_tools_orig/siod/editline.c	2025-07-01 08:56:19.585036094 +0900
++++ speech_tools/siod/editline.c	2025-07-01 09:04:43.746936756 +0900
+@@ -55,6 +55,7 @@
+ #include "editline.h"
+ #include "EST_unix.h"
+ #include <ctype.h>
++#include <ncurses/termcap.h>
+ 
+ /*
+ **  Manifest constants.
+@@ -222,12 +223,6 @@
+ **  Declarations.
+ */
+ STATIC ECHAR	*editinput();
+-#if	defined(USE_TERMCAP)
+-extern char	*getenv();
+-extern char	*tgetstr();
+-extern int	tgetent();
+-extern int	tgetnum();
+-#endif	/* defined(USE_TERMCAP) */
+ 
+ /*
+ **  TTY input/output functions.

speech_tools-substrcmp-size_t.patch

@@ -0,0 +1,30 @@
+diff -Naru speech_tools_orig/siod/editline.c speech_tools/siod/editline.c
+--- speech_tools_orig/siod/editline.c	2025-09-08 12:21:21.667547108 +0900
++++ speech_tools/siod/editline.c	2025-09-08 12:28:00.173458668 +0900
+@@ -176,7 +176,7 @@
+ STATIC STATUS h_prev();
+ STATIC STATUS h_first();
+ STATIC STATUS h_last();
+-STATIC int substrcmp(const char *text, const char *pat, long unsigned 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();
+@@ -792,7 +792,7 @@
+ /*
+ **  Return zero if pat appears as a substring in text.
+ */
+-STATIC int substrcmp(const char *text, const char *pat, long unsigned int len)
++STATIC int substrcmp(const char *text, const char *pat, size_t len)
+ {
+     ECHAR	c;
+ 
+@@ -809,7 +809,7 @@
+     static ECHAR	*old_search;
+     int		len;
+     int		pos;
+-    int		(*match)(const char *, const char *, long unsigned int);
++    int		(*match)(const char *, const char *, size_t);
+     char	*pat;
+ 
+     /* Save or get remembered search pattern. */