| 1 |
commit: 877fd25f3573d13adb4b60ec8772b24a5dee68e8 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 19:43:33 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 19:45:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877fd25f |
| 7 |
|
| 8 |
games-arcade/holotz-castle: tweak for gcc-11 |
| 9 |
|
| 10 |
Reported-by: Agostino Sarubbo |
| 11 |
Closes: https://bugs.gentoo.org/739092 |
| 12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/holotz-castle-1.3.14-gcc-11.patch | 30 ++++++++++++++++++++++ |
| 16 |
.../holotz-castle/holotz-castle-1.3.14-r1.ebuild | 3 ++- |
| 17 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..311c352731d |
| 22 |
--- /dev/null |
| 23 |
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch |
| 24 |
@@ -0,0 +1,30 @@ |
| 25 |
+https://bugs.gentoo.org/739092 |
| 26 |
+--- a/JLib/JLib/Util/JTextFile.cpp |
| 27 |
++++ b/JLib/JLib/Util/JTextFile.cpp |
| 28 |
+@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) |
| 29 |
+ |
| 30 |
+ tmp = strstr(ptr, str); |
| 31 |
+ |
| 32 |
+- if (tmp > 0) |
| 33 |
++ if (tmp) |
| 34 |
+ ptr = tmp; |
| 35 |
+ else |
| 36 |
+ { |
| 37 |
+@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) |
| 38 |
+ { |
| 39 |
+ tmp = strstr(buff, str); |
| 40 |
+ |
| 41 |
+- if (tmp > 0) |
| 42 |
++ if (tmp) |
| 43 |
+ ptr = tmp; |
| 44 |
+ else |
| 45 |
+ return false; |
| 46 |
+@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str) |
| 47 |
+ ++ptr; |
| 48 |
+ end = ptr; |
| 49 |
+ |
| 50 |
+- if (0 >= (end = strstr(ptr, "\""))) |
| 51 |
++ if ((end = strstr(ptr, "\"")) == NULL) |
| 52 |
+ { |
| 53 |
+ // No hay comillas de cierre |
| 54 |
+ ptr = org; |
| 55 |
|
| 56 |
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild |
| 57 |
index 202a35dbf6a..6b5db838ab7 100644 |
| 58 |
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild |
| 59 |
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild |
| 60 |
@@ -1,7 +1,7 @@ |
| 61 |
# Copyright 1999-2021 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
-EAPI=6 |
| 65 |
+EAPI=7 |
| 66 |
inherit desktop toolchain-funcs |
| 67 |
|
| 68 |
DESCRIPTION="2D platform game" |
| 69 |
@@ -29,6 +29,7 @@ PATCHES=( |
| 70 |
"${FILESDIR}"/${P}-build.patch |
| 71 |
"${FILESDIR}"/${P}-gcc44.patch |
| 72 |
"${FILESDIR}"/${P}-underlink.patch |
| 73 |
+ "${FILESDIR}"/${P}-gcc-11.patch |
| 74 |
) |
| 75 |
|
| 76 |
src_compile() { |
Archives