From eb0adc37eb3b7be756bd591c5420aecfa193b1c1 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 20 Dec 2022 12:38:10 +0100 Subject: [PATCH 01/11] Port to C99 (#2155183) Related to: --- foobillard-c99.patch | 15 +++++++++++++++ foobillard-configure-c99.patch | 18 ++++++++++++++++++ foobillard.spec | 9 ++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 foobillard-c99.patch create mode 100644 foobillard-configure-c99.patch diff --git a/foobillard-c99.patch b/foobillard-c99.patch new file mode 100644 index 0000000..f393fe3 --- /dev/null +++ b/foobillard-c99.patch @@ -0,0 +1,15 @@ +Avoid an implicit int to improve compatibility with future compilers. + +diff --git a/src/billmove.c b/src/billmove.c +index 447e31a6736fddf7..0182dc2bcad87998 100644 +--- a/src/billmove.c ++++ b/src/billmove.c +@@ -409,7 +409,7 @@ void record_move_log_event( enum event_type event, + } + + +-int my_rand(nr) ++int my_rand(int nr) + { + return rand()%nr; + } diff --git a/foobillard-configure-c99.patch b/foobillard-configure-c99.patch new file mode 100644 index 0000000..267547a --- /dev/null +++ b/foobillard-configure-c99.patch @@ -0,0 +1,18 @@ +Fix generic C99 compatibility issue in autoconf output. Newer autoconf +versions no longer generate this C fragment. + +diff --git a/configure b/configure +index 3caa19b115998588..fa9ee347ab4d20b9 100755 +--- a/configure ++++ b/configure +@@ -3555,8 +3555,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/foobillard.spec b/foobillard.spec index 7259e34..77e6ad9 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 42%{?dist} +Release: 43%{?dist} Summary: OpenGL billard game @@ -13,6 +13,8 @@ Source2: hobble-foobillard.sh Patch0: foobillard-3.0a-nonv.patch Patch1: foobillard-3.0a-no-fonts.patch Patch2: foobillard-3.0a-clothtex.patch +Patch3: foobillard-configure-c99.patch +Patch4: foobillard-c99.patch Requires: dejavu-sans-fonts BuildRequires: gcc BuildRequires: SDL-devel ImageMagick alsa-lib-devel @@ -30,6 +32,8 @@ FooBillard is still under development but the main physics is implemented. %patch0 -p1 %patch1 -p1 -b .no-fonts %patch2 -p0 -b .clothtex +%patch3 -p1 +%patch4 -p1 %build iconv -f iso-8859-1 -t utf-8 < ChangeLog > _ @@ -72,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Tue Dec 20 2022 Florian Weimer - 3.0a-43 +- Port to C99 (#2155183) + * Fri Dec 09 2022 Kalev Lember - 3.0a-42 - Make sure the installed icon is square - Install an additional 256x256 px sized icon From f2ad257f0a471dd4cc0601a805ebaf28f5ed066d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:45:01 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index 77e6ad9..22d4068 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 43%{?dist} +Release: 44%{?dist} Summary: OpenGL billard game @@ -76,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.0a-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 20 2022 Florian Weimer - 3.0a-43 - Port to C99 (#2155183) From 7c489fb371181d158602cd5f1691c7fbdc1bb425 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Mar 2023 15:00:14 -0600 Subject: [PATCH 03/11] migrated to SPDX license --- foobillard.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/foobillard.spec b/foobillard.spec index 22d4068..2086825 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,10 +1,10 @@ Name: foobillard Version: 3.0a -Release: 44%{?dist} +Release: 45%{?dist} Summary: OpenGL billard game -License: GPLv2 +License: GPL-2.0-only URL: http://foobillard.sunsite.dk/ # Based on http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz Source0: foobillard-3.0a-hobbled.tar.bz2 @@ -76,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Wed Mar 08 2023 Gwyn Ciesla - 3.0a-45 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 3.0a-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From cad789ef73f6584413899943efb65f34f7868625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:04:07 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index 2086825..c240b06 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 45%{?dist} +Release: 46%{?dist} Summary: OpenGL billard game @@ -76,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.0a-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 08 2023 Gwyn Ciesla - 3.0a-45 - migrated to SPDX license From cec543bacf00ee5a902627e8e3c7b59c74658979 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:38:00 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index c240b06..9bb6d28 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 46%{?dist} +Release: 47%{?dist} Summary: OpenGL billard game @@ -76,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.0a-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.0a-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 966d72c2a36ae183b7b537c347f8a98e4c3fae83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:53:17 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index 9bb6d28..4ca0292 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 47%{?dist} +Release: 48%{?dist} Summary: OpenGL billard game @@ -76,6 +76,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.0a-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.0a-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 79266413ea42a06cbee15fe3d20056322b0c0cf5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 5 Feb 2024 16:07:21 -0600 Subject: [PATCH 07/11] Patch for stricter flags --- foobillard.spec | 17 +++++++++++------ pointer-types.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 pointer-types.patch diff --git a/foobillard.spec b/foobillard.spec index 4ca0292..f3cdd99 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 48%{?dist} +Release: 49%{?dist} Summary: OpenGL billard game @@ -15,6 +15,7 @@ Patch1: foobillard-3.0a-no-fonts.patch Patch2: foobillard-3.0a-clothtex.patch Patch3: foobillard-configure-c99.patch Patch4: foobillard-c99.patch +Patch5: pointer-types.patch Requires: dejavu-sans-fonts BuildRequires: gcc BuildRequires: SDL-devel ImageMagick alsa-lib-devel @@ -29,11 +30,12 @@ FooBillard is still under development but the main physics is implemented. %prep %setup -q -n foobillard-3.0a -%patch0 -p1 -%patch1 -p1 -b .no-fonts -%patch2 -p0 -b .clothtex -%patch3 -p1 -%patch4 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 -b .no-fonts +%patch -P 2 -p0 -b .clothtex +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p0 %build iconv -f iso-8859-1 -t utf-8 < ChangeLog > _ @@ -76,6 +78,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Mon Feb 05 2024 Gwyn Ciesla - 3.0a-49 +- Patch for stricter flags + * Wed Jan 24 2024 Fedora Release Engineering - 3.0a-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/pointer-types.patch b/pointer-types.patch new file mode 100644 index 0000000..e35ae24 --- /dev/null +++ b/pointer-types.patch @@ -0,0 +1,34 @@ +--- src/billard3d.c~ 2004-04-23 20:20:49.000000000 -0500 ++++ src/billard3d.c 2024-02-05 15:51:12.482203297 -0600 +@@ -5100,7 +5100,7 @@ + + #if __BYTE_ORDER == __BIG_ENDIAN + { +- char *snd=ball_ball_snd.data; ++ char *snd=(char *)ball_ball_snd.data; + for(i=0;itobj, 0.0, 0.0, -1.0 ); +- gluTessCallback(tessdata->tobj, GLU_TESS_BEGIN, glBegin); +- gluTessCallback(tessdata->tobj, GLU_TESS_VERTEX, my_Vertex_cb); ++ gluTessCallback(tessdata->tobj, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin); ++ gluTessCallback(tessdata->tobj, GLU_TESS_VERTEX, (_GLUfuncptr)my_Vertex_cb); + gluTessCallback(tessdata->tobj, GLU_TESS_END, glEnd); + +- funcs.move_to = cb_tess_move_to; +- funcs.line_to = cb_tess_line_to; +- funcs.conic_to = cb_tess_conic_to; +- funcs.cubic_to = cb_tess_cubic_to; ++ funcs.move_to = (FT_Outline_MoveToFunc)cb_tess_move_to; ++ funcs.line_to = (FT_Outline_LineToFunc)cb_tess_line_to; ++ funcs.conic_to = (FT_Outline_ConicToFunc)cb_tess_conic_to; ++ funcs.cubic_to = (FT_Outline_CubicToFunc)cb_tess_cubic_to; + funcs.shift = 0; + funcs.delta = 0; + gluTessBeginPolygon(tessdata->tobj, NULL); From 97f267512296a5c6107c7fcc67d67675cd7ae96f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:27:58 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index f3cdd99..1dd9225 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 49%{?dist} +Release: 50%{?dist} Summary: OpenGL billard game @@ -78,6 +78,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.0a-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Feb 05 2024 Gwyn Ciesla - 3.0a-49 - Patch for stricter flags From 308e97874bbc885fa9f8b8fcc902dad375a642df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:38:13 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index 1dd9225..c1328de 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 50%{?dist} +Release: 51%{?dist} Summary: OpenGL billard game @@ -78,6 +78,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.0a-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 3.0a-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 07daff24b64492d0c05fde26a6809b04a728dabc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 31 Jan 2025 11:13:09 -0600 Subject: [PATCH 10/11] Fix FTBFS --- foobillard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index c1328de..ff5f9d6 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -40,7 +40,7 @@ FooBillard is still under development but the main physics is implemented. %build iconv -f iso-8859-1 -t utf-8 < ChangeLog > _ mv _ ChangeLog -./configure --prefix=%{_prefix} --disable-nvidia --enable-SDL CFLAGS="${RPM_OPT_FLAGS} -DUSE_SOUND" LDFLAGS="${RPM_LD_FLAGS}" +./configure --prefix=%{_prefix} --disable-nvidia --enable-SDL CFLAGS="${RPM_OPT_FLAGS} -DUSE_SOUND -std=gnu17" LDFLAGS="${RPM_LD_FLAGS}" make %{?_smp_mflags} convert -resize 48x48 -background transparent -gravity center -extent 48x48 data/foobillard.png foobillard.png convert -resize 256x256 -background transparent -gravity center -extent 256x256 data/foobillard.png foobillard-256x256.png From 4b7ae469e148214880d07fe3e468c9113d2e1631 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:42:04 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- foobillard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foobillard.spec b/foobillard.spec index ff5f9d6..db34bf9 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 51%{?dist} +Release: 52%{?dist} Summary: OpenGL billard game @@ -78,6 +78,9 @@ install -p -m 644 foobillard-256x256.png \ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.0a-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 3.0a-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild