| 1 |
commit: 9f145ea15cb30f7ce44772895cc03da3aa0c089b |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Tue Aug 31 08:11:52 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 31 08:11:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f145ea1 |
| 7 |
|
| 8 |
games-arcade/fishsupper: fix build, bump EAPI |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22160 |
| 11 |
Closes: https://bugs.gentoo.org/739090 |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 15 |
|
| 16 |
games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch | 14 ++++++++++++++ |
| 17 |
...shsupper-0.1.6-r2.ebuild => fishsupper-0.1.6-r3.ebuild} | 3 ++- |
| 18 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..3e4f6edbf63 |
| 23 |
--- /dev/null |
| 24 |
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch |
| 25 |
@@ -0,0 +1,14 @@ |
| 26 |
+Fix build with clang |
| 27 |
+https://bugs.gentoo.org/739090 |
| 28 |
+ |
| 29 |
+--- a/src/SFont_gl.cpp |
| 30 |
++++ b/src/SFont_gl.cpp |
| 31 |
+@@ -223,7 +223,7 @@ void Mafferyew::SFont_gl::create_font_char(SDL_Surface* image, |
| 32 |
+ 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000); |
| 33 |
+ #endif |
| 34 |
+ |
| 35 |
+- SDL_Rect src_rect = { begin_x, 1, font_char_w, font_height }; |
| 36 |
++ SDL_Rect src_rect = { (Sint16)begin_x, 1, (Uint16)font_char_w, (Uint16)font_height }; |
| 37 |
+ SDL_BlitSurface(image, &src_rect, converted, 0); |
| 38 |
+ |
| 39 |
+ GLuint texture; |
| 40 |
|
| 41 |
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild |
| 42 |
similarity index 95% |
| 43 |
rename from games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild |
| 44 |
rename to games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild |
| 45 |
index 1ffdfa94712..09a8ec5b5f2 100644 |
| 46 |
--- a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild |
| 47 |
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild |
| 48 |
@@ -1,7 +1,7 @@ |
| 49 |
# Copyright 1999-2021 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=7 |
| 53 |
+EAPI=8 |
| 54 |
|
| 55 |
inherit autotools desktop |
| 56 |
|
| 57 |
@@ -27,6 +27,7 @@ PATCHES=( |
| 58 |
"${FILESDIR}"/${P}-ovflfix.patch |
| 59 |
"${FILESDIR}"/${P}-asneeded.patch |
| 60 |
"${FILESDIR}"/${P}-gcc6.patch |
| 61 |
+ "${FILESDIR}"/${P}-int16.patch |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
Archives