cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport upstream fix for -fno-common.

Browse Source 
While here:
 - move homepage to https
 - update license marker
 - kill unnecessary post-install target
This commit is contained in:
bentley 2021-02-28 04:03:14 +00:00
parent 695255ea5d
commit 0ba10032f1
5 changed files with 70 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/freedroidrpg/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2021/02/23 19:39:22 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2021/02/28 04:03:14 bentley Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS} ${CLANG_ARCHS}
@ -7,11 +7,11 @@ COMMENT= isometric RPG game
DISTNAME = freedroidRPG-0.16.1
PKGNAME = ${DISTNAME:L}
CATEGORIES= games x11
REVISION = 2
REVISION = 3
HOMEPAGE = http://www.freedroid.org/
HOMEPAGE = https://www.freedroid.org/
# GPLv2
# GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB = ${MODLUA_WANTLIB}
@ -51,7 +51,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
USE_GMAKE = Yes
MAKE_FLAGS = AWK=gawk
post-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/freedroidrpg
.include <bsd.port.mk>

14
games/freedroidrpg/patches/patch-src_global_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_global_h,v 1.1 2021/02/28 04:03:14 bentley Exp $
Fix build with -fno-common.
https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761
Index: src/global.h
--- src/global.h.orig
+++ src/global.h
@@ -39,7 +39,6 @@ extern char *freedroid_version;
#define EXTERN extern
#endif
-EXTERN float FPSover1;
EXTERN char *AllSkillTexts[];
EXTERN char font_switchto_red[];
EXTERN char font_switchto_blue[];

18
games/freedroidrpg/patches/patch-src_lvledit_lvledit_tools_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_lvledit_lvledit_tools_h,v 1.1 2021/02/28 04:03:14 bentley Exp $
Fix build with -fno-common.
https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761
Index: src/lvledit/lvledit_tools.h
--- src/lvledit/lvledit_tools.h.orig
+++ src/lvledit/lvledit_tools.h
@@ -34,9 +34,9 @@ struct leveleditor_tool {
int (*display) ();
};
-void leveleditor_init_tools(void);
+EXTERN void leveleditor_init_tools(void);
-struct leveleditor_tool tool_place, tool_move, tool_select;
+EXTERN struct leveleditor_tool tool_place, tool_move, tool_select;
#define EVENT_LEFT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 1))
#define EVENT_RIGHT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 3))

19
games/freedroidrpg/patches/patch-src_mapgen_mapgen_h Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_mapgen_mapgen_h,v 1.1 2021/02/28 04:03:14 bentley Exp $
Fix build with -fno-common.
https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761
Index: src/mapgen/mapgen.h
--- src/mapgen/mapgen.h.orig
+++ src/mapgen/mapgen.h
@@ -64,9 +64,9 @@ extern struct roominfo *rooms;
extern int total_rooms;
// Interface to the game
-void (*dungeonmap_convert) (int, int, unsigned char *);
-void (*dungeonmap_place_enemies) (struct roominfo *);
-void (*dungeonmap_gift) (struct roominfo *);
+//void (*dungeonmap_convert) (int, int, unsigned char *);
+//void (*dungeonmap_place_enemies) (struct roominfo *);
+//void (*dungeonmap_gift) (struct roominfo *);
int generate_dungeon_gram(int, int);

15
games/freedroidrpg/patches/patch-src_struct_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_struct_h,v 1.1 2021/02/28 04:03:14 bentley Exp $
Fix build with -fno-common.
https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761
Index: src/struct.h
--- src/struct.h.orig
+++ src/struct.h
@@ -1022,7 +1022,7 @@ struct tux_rendering {
struct tux_part_instances default_instances; // Default part instances
tux_part_render_motionclass *render_order; // The render_sets of each motion class
int gun_muzzle_height; // Vertical offset to apply to bullets
-} tux_rendering;
+};
/**
* Contains a set of Tux's parts images for a motion class.