[packages/bomberclone] Rel 3

[arekm]

commit 3a0ea54c182580d46bc01ffee573eaadf9fe5df9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed May 20 14:57:27 2026 +0200

    Rel 3

 bomberclone-prototypes.patch   | 17 +++++++++++++++++
 bomberclone.spec               | 15 +++++++++++----
 bomberclonemserv-include.patch |  8 ++++----
 bomberclonemserv-socklen.patch | 15 +++++++++++++++
 4 files changed, 47 insertions(+), 8 deletions(-)
---
diff --git a/bomberclone.spec b/bomberclone.spec
index afd7a49..3299a2e 100644
--- a/bomberclone.spec
+++ b/bomberclone.spec
@@ -7,7 +7,7 @@ Summary:	Clone of the game AtomicBomberMan
 Summary(pl.UTF-8):	Klon gry AtomicBomberMan
 Name:		bomberclone
 Version:	0.11.9
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://downloads.sourceforge.net/bomberclone/%{name}-%{version}.tar.gz
@@ -18,6 +18,8 @@ Source2:	%{name}.desktop
 Patch0:		%{name}-link.patch
 Patch1:		%{name}mserv-include.patch
 Patch2:		%{name}mserv-flags.patch
+Patch3:		%{name}-prototypes.patch
+Patch4:		%{name}mserv-socklen.patch
 URL:		http://www.bomberclone.de/
 BuildRequires:	SDL_image-devel >= 1.2
 BuildRequires:	SDL_mixer-devel >= 1.2
@@ -53,11 +55,13 @@ do toczącej się gry poprzez wskazanie jej w menu.
 %prep
 %setup -q -a1
 %patch -P0 -p1
+%patch -P3 -p1
 %{__sed} '/SDL_LIBS.*ljpeg/d' -i configure.in
 
 cd %{_mserv}
 %patch -P1 -p1
 %patch -P2 -p0
+%patch -P4 -p1
 
 %build
 %{__aclocal}
@@ -65,7 +69,9 @@ cd %{_mserv}
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-debug
+	CFLAGS="%{rpmcppflags} %{rpmcflags} -std=gnu89" \
+	--disable-debug \
+	--disable-werror
 %{__make}
 
 cd %{_mserv}
@@ -73,9 +79,10 @@ cd %{_mserv}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	CPPFLAGS="%{rpmcppflags}"
 %{__make} \
-	OPTFLAGS="%{rpmcxxflags}"
+	OPTFLAGS="%{rpmcxxflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/bomberclone-prototypes.patch b/bomberclone-prototypes.patch
new file mode 100644
index 0000000..957580c
--- /dev/null
+++ b/bomberclone-prototypes.patch
@@ -0,0 +1,17 @@
+Fix prototypes for game_showresult{normal,team} which are defined with four
+int arguments but declared with empty parens. With GCC's stricter C rules
+this becomes a hard error (conflicting types).
+
+--- bomberclone-0.11.9/include/bomberclone.h.orig	2010-12-11 23:04:32.000000000 +0100
++++ bomberclone-0.11.9/include/bomberclone.h	2026-05-20 13:36:31.306586748 +0200
+@@ -123,8 +123,8 @@
+ extern void game_start();
+ extern void game_showresult ();
+ extern int game_check_endgame ();
+-extern void game_showresultnormal ();
+-extern void game_showresultteam ();
++extern void game_showresultnormal (int pos_x, int pos_y, int pos_w, int pos_h);
++extern void game_showresultteam (int pos_x, int pos_y, int pos_w, int pos_h);
+ extern void game_menu_create ();
+ extern void game_menu_loop (SDL_Event *event, int eventstate);
+ extern void game_resetdata ();
diff --git a/bomberclonemserv-include.patch b/bomberclonemserv-include.patch
index 8fa8782..da78883 100644
--- a/bomberclonemserv-include.patch
+++ b/bomberclonemserv-include.patch
@@ -1,10 +1,10 @@
---- bomberclonemserv-0.2.2/src/bcmserv.h.orig	2004-02-08 11:44:45.000000000 +0100
-+++ bomberclonemserv-0.2.2/src/bcmserv.h	2004-02-08 11:45:12.000000000 +0100
-@@ -22,7 +22,8 @@
+--- bomberclonemserv-0.2.2/src/bcmserv.h.orig	2003-05-05 01:56:40.000000000 +0200
++++ bomberclonemserv-0.2.2/src/bcmserv.h	2026-05-20 13:34:27.765679845 +0200
+@@ -24,6 +24,7 @@
  #include <string>
  #include <fstream>
  #include <iostream>
 +using namespace std;
- 
+
  #ifdef _WIN32
  #include <winsock.h>
diff --git a/bomberclonemserv-socklen.patch b/bomberclonemserv-socklen.patch
new file mode 100644
index 0000000..1254e86
--- /dev/null
+++ b/bomberclonemserv-socklen.patch
@@ -0,0 +1,15 @@
+Use socklen_t (not size_t) for the third argument of accept(). Modern glibc
+declares socklen_t as unsigned int, so size_t no longer matches and GCC
+treats this as a hard error.
+
+--- bomberclonemserv-0.2.2/src/tcp.c.orig
++++ bomberclonemserv-0.2.2/src/tcp.c
+@@ -278,7 +278,7 @@
+
+ /* Linux Code of the tcp part */
+     struct sockaddr_in cAddr;
+-    size_t addrlen = sizeof (struct sockaddr_in);
++    socklen_t addrlen = sizeof (struct sockaddr_in);
+
+     sock = accept (tcpsocket, (struct sockaddr *) &cAddr, &addrlen);
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bomberclone.git/commitdiff/3a0ea54c182580d46bc01ffee573eaadf9fe5df9