Attachment 235039 Details for Bug 264998 – games/luola: fix build with -fcommon

[patch] games/luola: fix build with -fcommon

0001-games-luola-fix-build-with-fcommon.patch (text/plain), 2.50 KB, created by Robert Clausecker on 2022-07-02 18:32:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-07-02 18:32:32 UTC

Size: 2.50 KB

patch

obsolete

>From 3ebb144fa0864077b36933f0eb919c90d67d58ee Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Sat, 2 Jul 2022 19:08:50 +0200
>Subject: [PATCH] games/luola: fix build with -fcommon
>
>While we are at it, change <sys/syslimits.h> in patch to
><limits.h> to avoid warning.
>---
> games/luola/Makefile                |  3 ---
> games/luola/files/patch-src__fs.h   |  2 +-
> games/luola/files/patch-src_pilot.c | 11 +++++++++++
> games/luola/files/patch-src_pilot.h | 11 +++++++++++
> 4 files changed, 23 insertions(+), 4 deletions(-)
> create mode 100644 games/luola/files/patch-src_pilot.c
> create mode 100644 games/luola/files/patch-src_pilot.h
>
>diff --git a/games/luola/Makefile b/games/luola/Makefile
>index 23ecc7fefc8a..e2c7e85d2e8a 100644
>--- a/games/luola/Makefile
>+++ b/games/luola/Makefile
>@@ -14,9 +14,6 @@ COMMENT=	2D multiplayer cave-flying game
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: Pilot
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: Pilot
>-
> GNU_CONFIGURE=	yes
> USES=		gmake sdl
> USE_SDL=	sdl image ttf
>diff --git a/games/luola/files/patch-src__fs.h b/games/luola/files/patch-src__fs.h
>index 1e947bae8701..989831598ee3 100644
>--- a/games/luola/files/patch-src__fs.h
>+++ b/games/luola/files/patch-src__fs.h
>@@ -4,7 +4,7 @@
>  #define FILESYSTEM_H
>  
>  #include <stdio.h>
>-+#include <sys/syslimits.h>
>++#include <limits.h>
>  #include "SDL.h"
>  
>  #include "ldat.h"
>diff --git a/games/luola/files/patch-src_pilot.c b/games/luola/files/patch-src_pilot.c
>new file mode 100644
>index 000000000000..510d72347f3b
>--- /dev/null
>+++ b/games/luola/files/patch-src_pilot.c
>@@ -0,0 +1,11 @@
>+--- src/pilot.c.orig	2022-07-02 17:04:58 UTC
>++++ src/pilot.c
>+@@ -43,6 +43,8 @@
>+ #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */
>+ #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */
>+ 
>++struct Pilot Pilot = {};
>++
>+ /* List of active pilots */
>+ struct dllist *pilot_list;
>+ 
>diff --git a/games/luola/files/patch-src_pilot.h b/games/luola/files/patch-src_pilot.h
>new file mode 100644
>index 000000000000..6882199fce06
>--- /dev/null
>+++ b/games/luola/files/patch-src_pilot.h
>@@ -0,0 +1,11 @@
>+--- src/pilot.h.orig	2022-07-02 17:04:35 UTC
>++++ src/pilot.h
>+@@ -34,7 +34,7 @@ struct Ship;
>+ 
>+ #define PARACHUTE_FRAME 2
>+ 
>+-struct Pilot {
>++extern struct Pilot {
>+     struct Walker walker;       /* inherits Walker */
>+     SDL_Surface *sprite[3];     /* Normal,Normal2, Parachute */
>+     Vector attack_vector;       /* Direction where gun is pointed to */
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval? (amdmi3)

Actions: View | Diff

Attachments on bug 264998: 235039