1 |
commit: 3fc8f4637e806784c1af4731386028e5f0ef456b |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 4 00:02:53 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 4 01:45:59 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc8f463 |
7 |
|
8 |
games-action/geki3-KXL: fix build w/ upcoming clang16 |
9 |
|
10 |
Also adjust old patch since moved string.h to geki3.h. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/874570 |
13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
14 |
|
15 |
.../geki3-KXL/files/geki3-KXL-1.0.3-clang.patch | 8 +------- |
16 |
.../geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch | 21 +++++++++++++++++++++ |
17 |
...XL-1.0.3-r4.ebuild => geki3-KXL-1.0.3-r5.ebuild} | 3 ++- |
18 |
3 files changed, 24 insertions(+), 8 deletions(-) |
19 |
|
20 |
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 |
21 |
index ad84615a398a..a661a6aaa73d 100644 |
22 |
--- a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch |
23 |
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch |
24 |
@@ -1,13 +1,7 @@ |
25 |
-Use void so that clang does not complain about missing (unused) |
26 |
-return value, and also add missing string.h. |
27 |
https://bugs.gentoo.org/730854 |
28 |
--- a/src/ranking.c |
29 |
+++ b/src/ranking.c |
30 |
-@@ -1,2 +1,3 @@ |
31 |
- #include <pwd.h> |
32 |
-+#include <string.h> |
33 |
- #include "geki3.h" |
34 |
-@@ -7,3 +8,3 @@ |
35 |
+@@ -7,3 +7,3 @@ |
36 |
**********************/ |
37 |
-int ScoreRanking(void) |
38 |
+void ScoreRanking(void) |
39 |
|
40 |
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 |
41 |
new file mode 100644 |
42 |
index 000000000000..fb76b688783d |
43 |
--- /dev/null |
44 |
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang16.patch |
45 |
@@ -0,0 +1,21 @@ |
46 |
+https://bugs.gentoo.org/874570 |
47 |
+--- a/src/geki3.h |
48 |
++++ b/src/geki3.h |
49 |
+@@ -11,2 +11,4 @@ |
50 |
+ #include <stdlib.h> |
51 |
++#include <string.h> |
52 |
++#include <time.h> |
53 |
+ #include <sys/types.h> |
54 |
+--- a/src/load.h |
55 |
++++ b/src/load.h |
56 |
+@@ -11,2 +11,3 @@ |
57 |
+ void LoadStageData(void); |
58 |
++void UnLoadStageData(void); |
59 |
+ |
60 |
+--- a/src/your.h |
61 |
++++ b/src/your.h |
62 |
+@@ -14,2 +14,4 @@ |
63 |
+ speed, Uint8 sel); |
64 |
++void CreateEnemyBomb(Sint16 x, Sint16 y, Uint16 direction, Uint16 speed); |
65 |
++void CreateMissile(CharacterData *my, Sint16 x, Sint16 y); |
66 |
+ |
67 |
|
68 |
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 |
69 |
similarity index 93% |
70 |
rename from games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild |
71 |
rename to games-action/geki3-KXL/geki3-KXL-1.0.3-r5.ebuild |
72 |
index a7530fbd1953..2080d24ddd62 100644 |
73 |
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild |
74 |
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r5.ebuild |
75 |
@@ -1,4 +1,4 @@ |
76 |
-# Copyright 1999-2021 Gentoo Authors |
77 |
+# Copyright 1999-2022 Gentoo Authors |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
|
80 |
EAPI=8 |
81 |
@@ -26,6 +26,7 @@ RDEPEND=" |
82 |
PATCHES=( |
83 |
"${FILESDIR}"/${P}-cflags.patch |
84 |
"${FILESDIR}"/${P}-clang.patch |
85 |
+ "${FILESDIR}"/${P}-clang16.patch |
86 |
) |
87 |
|
88 |
src_prepare() { |