From 64d364dadbae9aa1770182ae9c3a0b4fc7b5d605d96699965e012166c012df54 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 11:55:12 +0000 Subject: [PATCH 1/2] [info=87c9b1ed2f198900e332ccdd2e261b46056cacf8d75f2e272c7c0931ae24ff08] OBS-URL: https://build.opensuse.org/package/show/Education/gtypist?expand=0&rev=16 --- .gitattributes | 23 ++++++++++ .gitignore | 1 + _scmsync.obsinfo | 4 ++ build.specials.obscpio | 3 ++ escdelay.diff | 23 ++++++++++ gtypist-2.9.5.tar.xz | 3 ++ gtypist-2.9.5.tar.xz.sig | 19 ++++++++ gtypist.changes | 46 +++++++++++++++++++ gtypist.keyring | 69 +++++++++++++++++++++++++++++ gtypist.spec | 96 ++++++++++++++++++++++++++++++++++++++++ 10 files changed, 287 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 escdelay.diff create mode 100644 gtypist-2.9.5.tar.xz create mode 100644 gtypist-2.9.5.tar.xz.sig create mode 100644 gtypist.changes create mode 100644 gtypist.keyring create mode 100644 gtypist.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..81a6bdf --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1598726019 +commit: 87c9b1ed2f198900e332ccdd2e261b46056cacf8d75f2e272c7c0931ae24ff08 +url: https://src.opensuse.org/jengelh/gtypist +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..44af0f6 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6823d7009a80e8b530c4251572c2966d83b1d5b27f4045e36caef210d274606 +size 256 diff --git a/escdelay.diff b/escdelay.diff new file mode 100644 index 0000000..eb205ed --- /dev/null +++ b/escdelay.diff @@ -0,0 +1,23 @@ +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/gtypist-2.9.5.tar.xz b/gtypist-2.9.5.tar.xz new file mode 100644 index 0000000..f8ae451 --- /dev/null +++ b/gtypist-2.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c13af40b12479f8219ffa6c66020618c0ce305ad305590fde02d2c20eb9cf977 +size 929356 diff --git a/gtypist-2.9.5.tar.xz.sig b/gtypist-2.9.5.tar.xz.sig new file mode 100644 index 0000000..9833e6d --- /dev/null +++ b/gtypist-2.9.5.tar.xz.sig @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQJ8BAABCgBmBQJT6dFVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGOEYwOUMwQjc5RjkwQTIwRjk1M0ZCMUNB +NkQ4MTNEOEM5NEFGQTUyAAoJEKbYE9jJSvpS22oQAKKD27OkeMtOF84EVJP9OAQH +erxBWPnEOEhFiNuP2jM77Vco7TgQfOLb9hWq0gy1qIkfHRJGpnxSiQyWQWgpq4i4 +i3jExao7/x59BKl3N1Qt7prPpbckpb6qqwEyAmrIub3oucID6JqG9AmekMdNpzP+ +awSY7NxH1gqMvxv9FuuUQgJhVzesAXJfRTiUaks9SS7YK7WMQngHm3rbr7PPB3w6 +Y/33KZLvMlRl67sz1UG9h7EonMHvI+kQCBHtnSI2bdv6ANdQkZm4SXvr4QzB1CdR +/kTd8LXdgFFWSaQOOaQjJzSFKhO1bmQpHGVHKq6JHbqPht7tG4UfQADxc1kT9u+C ++vidQNQooOU6Un4e6V188TMYpKyR0Ajg3IZzL9v2RYCkPuuLIVtqBW7AsA/wQ2wM +7U+r3AbTDy5/PpBoQ16HQglvqOKPQyExNy/6IZNTn+/G89VAmS2oE99jEeie7dQb +tTnzJQUUKtTO8SbV6KR7ibD0inUMFaPFxdMnIVDYkCV9yZijUcOYRCiMmrdsX1ub +F7joUS1yGd0wz4B7oNI1KAOLfs11eSl79DACtJ6vmw4HQcqre1NUx1taVoG9HUfN +77NhJegXiKVicVfr+A4mEVcEeLc5DtndQq6CXaIZuh7TRvlrhNS66MyRGYRxXDXj +3R/TIImGme17rPS5n4l8 +=UepC +-----END PGP SIGNATURE----- diff --git a/gtypist.changes b/gtypist.changes new file mode 100644 index 0000000..ffc8781 --- /dev/null +++ b/gtypist.changes @@ -0,0 +1,46 @@ +------------------------------------------------------------------- +Tue Aug 25 20:58:49 UTC 2020 - Jan Engelhardt + +- Remove old rpm recipe constructs. + +------------------------------------------------------------------- +Wed Sep 23 10:21:45 UTC 2015 - jengelh@inai.de + +- Add escdelay.diff to work around unintended use of ncurses API + +------------------------------------------------------------------- +Wed Oct 1 12:40:16 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 2.9.5 +* improved CPM/WPM calculation precision +* Q series +* fix for Colemak lesson (updated top 1000 most frequently used + words) + +------------------------------------------------------------------- +Tue Sep 23 15:37:45 UTC 2014 - jengelh@inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- +Tue Feb 4 02:29:09 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 2.9.4 +* This release has a fix for Colemak lesson. There are minor + documentation fixes. + +------------------------------------------------------------------- +Sat Jun 8 13:45:32 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.9.3 +* This release fixes Alt+some key being treated as ESCAPE and + clearing drills, updates the ktouch lesson import script, updates + lessons imported from ktouch (fixing an issue with lines over 80 + characters causing errors, amongst other things), and fixes + errors in lessons. + +------------------------------------------------------------------- +Mon Dec 17 22:34:08 UTC 2012 - jengelh@inai.de + +- Initial package (version 2.9.2) for build.opensuse.org diff --git a/gtypist.keyring b/gtypist.keyring new file mode 100644 index 0000000..d407cb8 --- /dev/null +++ b/gtypist.keyring @@ -0,0 +1,69 @@ +pub 4096R/C94AFA52 2011-01-09 +uid Tim Marston +uid Tim Marston +sub 4096R/5F26A28E 2011-01-09 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +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 +=iRm/ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gtypist.spec b/gtypist.spec new file mode 100644 index 0000000..f905136 --- /dev/null +++ b/gtypist.spec @@ -0,0 +1,96 @@ +# +# spec file for package gtypist +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: gtypist +Version: 2.9.5 +Release: 0 +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 +BuildRequires: bison +BuildRequires: ncurses-devel +BuildRequires: xz +PreReq: %install_info_prereq + +%description +GNU Typist (typist) is a universal typing tutor. You can learn +correct typing and improve your skills by practising its exercises on +a regular basis. Its main features are: + +* It comes with several typing tutorials: in Czech, English (Qwerty, + Dvorak and Colemak keyboards), Russian and Spanish, as well as + simpler exercises in German, French and Norwegian. + +* It interprets a simple and intuitive scripting language that + describes typing tutorials. You can easily modify existing + tutorials or create new ones according to your needs. + +* Users can navigate through lessons through an easy to use arrow key + based menu interface. 'vi' up, down, left and right keys can be + used too. + +%package lang +Summary: Language files for package gtypist +Group: System/Localization +Requires: gtypist = %{version} + +%description lang +GNU Typist (typist) is a universal typing tutor. You can learn +correct typing and improve your skills by practising its exercises on +a regular basis. + +This subpackage contain the translations for the package gtypist. + +%prep +%autosetup -p1 + +%build +%configure +make %{?_smp_mflags} + +%install +%make_install +%find_lang %name + +%post +for i in "%_infodir"/gtypist*.gz; do + %install_info --info-dir="%_infodir" "$i" +done; + +%preun +for i in "%_infodir"/gtypist*.gz; do + %install_info_delete --info-dir="%_infodir" "$i" +done; + +%files +%_bindir/gtypist +%_bindir/typefortune +%_datadir/gtypist/ +%_infodir/gtypist*.gz +%_datadir/man/man1/gtypist.1* +%_datadir/man/man1/typefortune.1* + +%files lang -f %name.lang + +%changelog From 719863a2e9416e373bbe3ca5b3877a3ccbb6318f172a772a17f122c61b84d0a0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 2 Nov 2024 11:58:05 +0000 Subject: [PATCH 2/2] [info=7486127ac85ef800a382735d898ed945aa341e64efbe2d1ee333cb28361c4d4e] OBS-URL: https://build.opensuse.org/package/show/Education/gtypist?expand=0&rev=17 --- _scmsync.obsinfo | 4 +-- build.specials.obscpio | 2 +- escdelay.diff | 23 --------------- gcc14.patch | 64 ++++++++++++++++++++++++++++++++++++++++++ gtypist.changes | 5 ++++ gtypist.spec | 7 ++--- 6 files changed, 75 insertions(+), 30 deletions(-) delete mode 100644 escdelay.diff create mode 100644 gcc14.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 81a6bdf..e0939eb 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1598726019 -commit: 87c9b1ed2f198900e332ccdd2e261b46056cacf8d75f2e272c7c0931ae24ff08 +mtime: 1730548659 +commit: 7486127ac85ef800a382735d898ed945aa341e64efbe2d1ee333cb28361c4d4e url: https://src.opensuse.org/jengelh/gtypist revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 44af0f6..87408b3 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6823d7009a80e8b530c4251572c2966d83b1d5b27f4045e36caef210d274606 +oid sha256:4720e49a259b9ab5ce7bd4e4cf42d3ee7af5482b128dd0ad203c54ca1c067072 size 256 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