summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-11-21 22:01:48 +0100
committerDavid Seifert <soap@gentoo.org>2020-11-21 22:01:48 +0100
commit35ac0c893a3c15c90100033ed7962f63640b7fb7 (patch)
tree609d48177e3719dfcb4526fcdbe36ae4cab302a9
parentapp-office/libreoffice: Backport disable-pdfium fix from 7.0 branch (diff)
downloadgentoo-35ac0c893a3c15c90100033ed7962f63640b7fb7.tar.gz
gentoo-35ac0c893a3c15c90100033ed7962f63640b7fb7.tar.bz2
gentoo-35ac0c893a3c15c90100033ed7962f63640b7fb7.zip
games-action/0verkill: Port to EAPI 7
Closes: https://bugs.gentoo.org/708718 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--games-action/0verkill/0verkill-0.16-r4.ebuild17
-rw-r--r--games-action/0verkill/files/0verkill-0.16-fno-common.patch87
2 files changed, 96 insertions, 8 deletions
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index e1b5419bf8c..39ebed3ca4c 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )"
RDEPEND=${DEPEND}
PATCHES=(
- "${FILESDIR}"/${P}-docs.patch
- "${FILESDIR}"/${P}-home-overflow.patch
- "${FILESDIR}"/${P}-segv.patch
- "${FILESDIR}"/${P}-gentoo-paths.patch
- "${FILESDIR}"/${P}-ovflfix.patch
- "${FILESDIR}"/${P}-CC.patch
- "${FILESDIR}"/${P}-underflow-check.patch #136222
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-home-overflow.patch
+ "${FILESDIR}"/${P}-segv.patch
+ "${FILESDIR}"/${P}-gentoo-paths.patch
+ "${FILESDIR}"/${P}-ovflfix.patch
+ "${FILESDIR}"/${P}-CC.patch
+ "${FILESDIR}"/${P}-underflow-check.patch #136222
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
new file mode 100644
index 00000000000..bf03ff424e2
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
@@ -0,0 +1,87 @@
+--- a/bot.c
++++ b/bot.c
+@@ -104,7 +104,7 @@
+
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+
+ unsigned long_long game_start_offset; /* time difference between game start on this machine and on server */
+--- a/client.c
++++ b/client.c
+@@ -97,7 +97,7 @@
+
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+
+ /* important sprites */
+--- a/data.c
++++ b/data.c
+@@ -13,6 +13,9 @@
+ #include "md5.h"
+ #include "error.h"
+
++unsigned char *weapon_name[ARMS];
++struct obj_attr_type obj_attr[N_TYPES];
++struct weapon_type weapon[ARMS];
+
+ #ifdef TRI_D
+ int tri_d=0;
+--- a/data.h
++++ b/data.h
+@@ -62,7 +62,7 @@
+
+ #define ARMS 5
+
+-unsigned char *weapon_name[ARMS];
++extern unsigned char *weapon_name[ARMS];
+
+ /* STATUS
+ 0: walk
+@@ -91,7 +91,8 @@
+ bit 1=server updates
+ bit 2=server sends updates to clients
+ */
+-}obj_attr[N_TYPES];
++};
++extern struct obj_attr_type obj_attr[N_TYPES];
+
+
+ /* weapon attribut table */
+@@ -107,7 +108,8 @@
+ unsigned char add_ammo;
+ unsigned char max_ammo;
+ my_double shell_xspeed,shell_yspeed;
+-}weapon[ARMS];
++};
++extern struct weapon_type weapon[ARMS];
+
+
+ /* object in the game */
+--- a/editor.c
++++ b/editor.c
+@@ -26,7 +26,7 @@
+ int oldx=0,oldy=0; /* old cursor position */
+
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ int level_number;
+
+
+--- a/server.c
++++ b/server.c
+@@ -100,7 +100,7 @@
+ struct object_list objects;
+
+ struct player_list *last_player;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+
+
+ #ifdef WIN32