From 9f145ea15cb30f7ce44772895cc03da3aa0c089b Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+gentoo@asokolov.org>
Date: Tue, 31 Aug 2021 10:11:52 +0200
Subject: games-arcade/fishsupper: fix build, bump EAPI

Closes: https://github.com/gentoo/gentoo/pull/22160
Closes: https://bugs.gentoo.org/739090
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: David Seifert <soap@gentoo.org>
---
 .../fishsupper/files/fishsupper-0.1.6-int16.patch  | 14 +++++++
 games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild | 42 ---------------------
 games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild | 43 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 42 deletions(-)
 create mode 100644 games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch
 delete mode 100644 games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild
 create mode 100644 games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild

(limited to 'games-arcade')

diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch
new file mode 100644
index 000000000000..3e4f6edbf631
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch
@@ -0,0 +1,14 @@
+Fix build with clang
+https://bugs.gentoo.org/739090
+
+--- a/src/SFont_gl.cpp
++++ b/src/SFont_gl.cpp
+@@ -223,7 +223,7 @@ void Mafferyew::SFont_gl::create_font_char(SDL_Surface* image,
+                                      0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
+ #endif
+     
+-    SDL_Rect src_rect = { begin_x, 1, font_char_w, font_height };
++    SDL_Rect src_rect = { (Sint16)begin_x, 1, (Uint16)font_char_w, (Uint16)font_height };
+     SDL_BlitSurface(image, &src_rect, converted, 0);
+     
+     GLuint texture;
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild
deleted file mode 100644
index 1ffdfa94712f..000000000000
--- a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
-HOMEPAGE="https://sourceforge.net/projects/fishsupper/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="CC-BY-SA-2.5 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl[joystick,sound,video,opengl,X]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[wav]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ovflfix.patch
-	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newicon data/images/fs_sprite_042.png ${PN}.png
-	make_desktop_entry ${PN} "Fish Supper"
-}
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild
new file mode 100644
index 000000000000..09a8ec5b5f2a
--- /dev/null
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
+HOMEPAGE="https://sourceforge.net/projects/fishsupper/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="CC-BY-SA-2.5 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[joystick,sound,video,opengl,X]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[wav]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ovflfix.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-int16.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newicon data/images/fs_sprite_042.png ${PN}.png
+	make_desktop_entry ${PN} "Fish Supper"
+}
-- 
cgit v1.2.3-65-gdbad