[gentoo-commits] repo/gentoo:master commit in: games-arcade/fishsupper/, games-arcade/fishsupper/files/
commit: 9f145ea15cb30f7ce44772895cc03da3aa0c089b
Author: Alexey Sokolov asokolov org>
AuthorDate: Tue Aug 31 08:11:52 2021 +
Commit: David Seifert gentoo org>
CommitDate: Tue Aug 31 08:11:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f145ea1
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 asokolov.org>
Signed-off-by: David Seifert gentoo.org>
games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch | 14 ++
...shsupper-0.1.6-r2.ebuild => fishsupper-0.1.6-r3.ebuild} | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
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 000..3e4f6edbf63
--- /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,
+ 0x00ff, 0xff00, 0x00ff,
0xff00);
+ #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, _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-r3.ebuild
similarity index 95%
rename from games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild
rename to games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild
index 1ffdfa94712..09a8ec5b5f2 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools desktop
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${P}-ovflfix.patch
"${FILESDIR}"/${P}-asneeded.patch
"${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-int16.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-arcade/fishsupper/, games-arcade/fishsupper/files/
commit: e6f680b7de7fbccb756eee3d4eb834b6b3c82b1d
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 16 19:43:39 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 16 20:26:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f680b7
games-arcade/fishsupper: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../files/fishsupper-0.1.6-asneeded.patch | 4 +--
.../files/fishsupper-0.1.6-ovflfix.patch | 4 +--
games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild | 38 ++
3 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
index 2aba6f099e8..eae5ca15921 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
@@ -1,5 +1,5 @@
src/Makefile.am.old2012-06-24 18:47:58.947143638 +0200
-+++ src/Makefile.am2012-06-24 18:51:35.738921904 +0200
+--- a/src/Makefile.am.old 2012-06-24 18:47:58.947143638 +0200
b/src/Makefile.am 2012-06-24 18:51:35.738921904 +0200
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
@SDL_CFLAGS@ \
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
index 4d5185dae7e..2be91b65a16 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
@@ -1,5 +1,5 @@
src/main.cpp.old 2012-06-24 18:35:27.661894094 +0200
-+++ src/main.cpp 2012-06-24 18:35:41.041954632 +0200
+--- a/src/main.cpp.old 2012-06-24 18:35:27.661894094 +0200
b/src/main.cpp 2012-06-24 18:35:41.041954632 +0200
@@ -293,7 +293,7 @@
if (!ok)
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
new file mode 100644
index 000..e73b4a0b1d7
--- /dev/null
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+IUSE=""
+
+RDEPEND="
+ media-libs/libsdl[sound,video,opengl,X]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[wav]
+ virtual/opengl
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-ovflfix.patch \
+ "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
+ eautoreconf
+}
+
+src_install() {
+ default
+ newicon data/images/fs_sprite_042.png ${PN}.png
+ make_desktop_entry ${PN} "Fish Supper"
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/fishsupper/, games-arcade/fishsupper/files/
commit: be927cf2c7807684a49dd9790b738154d914bb33
Author: Peter Levine gmail com>
AuthorDate: Sun Jul 23 02:27:54 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jul 30 09:09:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be927cf2
games-arcade/fishsupper: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610660
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5180
.../fishsupper/files/fishsupper-0.1.6-gcc6.patch | 49 ++
games-arcade/fishsupper/fishsupper-0.1.6.ebuild| 5 ++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch
b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch
new file mode 100644
index 000..3ca63cb4a68
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/610660
+
+--- a/src/Settings_screen.cpp
b/src/Settings_screen.cpp
+@@ -217,3 +217,7 @@
+
+ // **
+
++const float FS::Settings_screen::bold = 1.0;
++const float FS::Settings_screen::faded = 0.2;
++
++// **
+--- a/src/Settings_screen.h
b/src/Settings_screen.h
+@@ -71,8 +71,8 @@
+ static const int tick1_x = 252;
+ static const int tick_y_offset = 33;
+ static const int sprite_texture_start = FS_gfx::JOYSTICK;
+-static const float bold = 1.0;
+-static const float faded = 0.2;
++static const float bold;
++static const float faded;
+
+ Settings* settings_ptr;
+ int current_option;
+--- a/src/Star_particle_system.cpp
b/src/Star_particle_system.cpp
+@@ -137,6 +137,10 @@
+ } // FS::Star_particle_system::launch_new_star
+
+ // **
++
++const float FS::Star_particle_system::lifespan = 1500.0;
++
++// **
+ // **
+ // **
+ // **
+--- a/src/Star_particle_system.h
b/src/Star_particle_system.h
+@@ -77,7 +77,7 @@
+ static const int STAR_WIDTH = 30;
+ static const int STAR_HEIGHT = 30;
+ // This is a float so that we get floating-point division in update.
+-static const float lifespan = 1500.0; // in ms
++static const float lifespan; // in ms
+
+ // A particle is basically a lightweight sprite.
+ // Unlike a usual sprite, we don't need to worry about
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
index ab2a7c88615..f8bd06bcde9 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-ovflfix.patch \
- "${FILESDIR}"/${P}-asneeded.patch
+ "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
eautoreconf
}
