summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-11-03 20:02:53 -0400
committerIonen Wolkens <ionen@gentoo.org>2022-11-03 21:45:59 -0400
commit3fc8f4637e806784c1af4731386028e5f0ef456b (patch)
tree9bb3cbbe446e3b01f8456da0010fa30002cac8cd
parentmedia-video/asfrecorder: EAPI7->8, fix build w/ upcoming clang16 (diff)
downloadgentoo-3fc8f4637e806784c1af4731386028e5f0ef456b.tar.gz
gentoo-3fc8f4637e806784c1af4731386028e5f0ef456b.tar.bz2
gentoo-3fc8f4637e806784c1af4731386028e5f0ef456b.zip
games-action/geki3-KXL: fix build w/ upcoming clang16
Also adjust old patch since moved string.h to geki3.h. Closes: https://bugs.gentoo.org/874570 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch8
-rw-r--r--games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch21
-rw-r--r--games-action/geki3-KXL/geki3-KXL-1.0.3-r5.ebuild (renamed from games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild)3
3 files changed, 24 insertions, 8 deletions
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch
index ad84615a398a..a661a6aaa73d 100644
--- a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch
@@ -1,13 +1,7 @@
-Use void so that clang does not complain about missing (unused)
-return value, and also add missing string.h.
https://bugs.gentoo.org/730854
--- a/src/ranking.c
+++ b/src/ranking.c
-@@ -1,2 +1,3 @@
- #include <pwd.h>
-+#include <string.h>
- #include "geki3.h"
-@@ -7,3 +8,3 @@
+@@ -7,3 +7,3 @@
**********************/
-int ScoreRanking(void)
+void ScoreRanking(void)
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch
new file mode 100644
index 000000000000..fb76b688783d
--- /dev/null
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/874570
+--- a/src/geki3.h
++++ b/src/geki3.h
+@@ -11,2 +11,4 @@
+ #include <stdlib.h>
++#include <string.h>
++#include <time.h>
+ #include <sys/types.h>
+--- a/src/load.h
++++ b/src/load.h
+@@ -11,2 +11,3 @@
+ void LoadStageData(void);
++void UnLoadStageData(void);
+
+--- a/src/your.h
++++ b/src/your.h
+@@ -14,2 +14,4 @@
+ speed, Uint8 sel);
++void CreateEnemyBomb(Sint16 x, Sint16 y, Uint16 direction, Uint16 speed);
++void CreateMissile(CharacterData *my, Sint16 x, Sint16 y);
+
diff --git a/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild b/games-action/geki3-KXL/geki3-KXL-1.0.3-r5.ebuild
index a7530fbd1953..2080d24ddd62 100644
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,6 +26,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {