diff --git a/escdelay.diff b/escdelay.diff deleted file mode 100644 index eb205ed..0000000 --- a/escdelay.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -Date: 2015-09-23 11:59:16.636824539 +0200 - -In modern ncurses, ESCDELAY is not an lvalue (also because the -ESCDELAY "variable" is meant to be read-only). - ---- - src/gtypist.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gtypist-2.9.5/src/gtypist.c -=================================================================== ---- gtypist-2.9.5.orig/src/gtypist.c -+++ gtypist-2.9.5/src/gtypist.c -@@ -2205,7 +2205,7 @@ int main( int argc, char **argv ) - - // Quick hack to get rid of the escape delays - #ifdef __NCURSES_H -- ESCDELAY = 1; -+ set_escdelay(1); - #endif - - /* set up colour pairs if possible */ diff --git a/gcc14.patch b/gcc14.patch new file mode 100644 index 0000000..b7674cc --- /dev/null +++ b/gcc14.patch @@ -0,0 +1,64 @@ +From: Jan Engelhardt +Date: 2024-11-02 12:54:12.376370921 +0100 + +cursmenu.c:272:33: error: implicit declaration of function ‘utf8len’ [-Wimplicit-function-declaration] +gtypist.c:2208:12: error: lvalue required as left operand of assignment + 2208 | ESCDELAY = 1; + +--- + src/cursmenu.c | 1 + + src/gtypist.c | 2 +- + src/script.h | 2 +- + src/utf8.c | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +Index: gtypist-2.9.5/src/cursmenu.c +=================================================================== +--- gtypist-2.9.5.orig/src/cursmenu.c ++++ gtypist-2.9.5/src/cursmenu.c +@@ -20,6 +20,7 @@ + #include "config.h" + #include "cursmenu.h" + #include "script.h" ++#include "utf8.h" + + #ifdef HAVE_PDCURSES + #include +Index: gtypist-2.9.5/src/gtypist.c +=================================================================== +--- gtypist-2.9.5.orig/src/gtypist.c ++++ gtypist-2.9.5/src/gtypist.c +@@ -2205,7 +2205,7 @@ int main( int argc, char **argv ) + + // Quick hack to get rid of the escape delays + #ifdef __NCURSES_H +- ESCDELAY = 1; ++ set_escdelay(1); + #endif + + /* set up colour pairs if possible */ +Index: gtypist-2.9.5/src/script.h +=================================================================== +--- gtypist-2.9.5.orig/src/script.h ++++ gtypist-2.9.5/src/script.h +@@ -89,7 +89,7 @@ extern char *buffer_command( FILE *scrip + extern void seek_label( FILE *script, char *label, char *ref_line ); + extern int hash_label( char *label ); + extern void do_exit( FILE *script ); +- ++extern void check_script_file_with_current_encoding(FILE *script); + + extern void bind_F12 (const char *); // Defined in gtypist.c + +Index: gtypist-2.9.5/src/utf8.c +=================================================================== +--- gtypist-2.9.5.orig/src/utf8.c ++++ gtypist-2.9.5/src/utf8.c +@@ -19,6 +19,7 @@ + + #include "config.h" + #include "utf8.h" ++#include "error.h" + + #ifdef HAVE_PDCURSES + #include diff --git a/gtypist.changes b/gtypist.changes index ffc8781..e73c451 100644 --- a/gtypist.changes +++ b/gtypist.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 2 11:55:19 UTC 2024 - Jan Engelhardt + +- Replace escdelay.diff by new gcc14.patch to resolve more FTBFS + ------------------------------------------------------------------- Tue Aug 25 20:58:49 UTC 2020 - Jan Engelhardt diff --git a/gtypist.spec b/gtypist.spec index f905136..f7c8899 100644 --- a/gtypist.spec +++ b/gtypist.spec @@ -1,7 +1,7 @@ # # spec file for package gtypist # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,11 +23,10 @@ Summary: Universal typing tutor License: GPL-3.0-only Group: Amusements/Teaching/Other URL: http://gnu.org/software/gtypist/ - Source: http://ftp.gnu.org/gnu/gtypist/%name-%version.tar.xz Source2: http://ftp.gnu.org/gnu/gtypist/%name-%version.tar.xz.sig Source3: %name.keyring -Patch1: escdelay.diff +Patch1: gcc14.patch BuildRequires: bison BuildRequires: ncurses-devel BuildRequires: xz @@ -67,7 +66,7 @@ This subpackage contain the translations for the package gtypist. %build %configure -make %{?_smp_mflags} +%make_build %install %make_install