summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-arcade/njam')
-rw-r--r--games-arcade/njam/files/njam-1.25-format-security.patch13
-rw-r--r--games-arcade/njam/files/njam-1.25-gcc45.patch4
-rw-r--r--games-arcade/njam/njam-1.25-r1.ebuild52
3 files changed, 67 insertions, 2 deletions
diff --git a/games-arcade/njam/files/njam-1.25-format-security.patch b/games-arcade/njam/files/njam-1.25-format-security.patch
new file mode 100644
index 000000000000..66c8b17085ba
--- /dev/null
+++ b/games-arcade/njam/files/njam-1.25-format-security.patch
@@ -0,0 +1,13 @@
+diff -up njam-1.25-src/src/njamgame.cpp~ njam-1.25-src/src/njamgame.cpp
+--- njam-1.25-src/src/njamgame.cpp~ 2005-12-13 12:56:42.000000000 +0100
++++ njam-1.25-src/src/njamgame.cpp 2014-06-14 11:54:12.320854217 +0200
+@@ -227,8 +227,7 @@ void NjamEngine::StartGame(GameType Gt)
+ SDL_Surface *temp = IMG_Load(filename);
+ if (!temp)
+ {
+- printf("Loading file: %s", filename);
+- printf(SDL_GetError());
++ printf("Error loading file %s: %s\n", filename, SDL_GetError());
+ return;
+ }
+
diff --git a/games-arcade/njam/files/njam-1.25-gcc45.patch b/games-arcade/njam/files/njam-1.25-gcc45.patch
index b74bc3dac105..c6515ef0aaa9 100644
--- a/games-arcade/njam/files/njam-1.25-gcc45.patch
+++ b/games-arcade/njam/files/njam-1.25-gcc45.patch
@@ -2,8 +2,8 @@ Fix buiding with gcc 4.5
http://bugs.gentoo.org/show_bug.cgi?id=318411
---- src/njamedit.cpp
-+++ src/njamedit.cpp
+--- a/src/njamedit.cpp
++++ b/src/njamedit.cpp
@@ -114,7 +114,7 @@
key = SDLK_a;
else if (CheckForSave())
diff --git a/games-arcade/njam/njam-1.25-r1.ebuild b/games-arcade/njam/njam-1.25-r1.ebuild
new file mode 100644
index 000000000000..2bdb8acf9b96
--- /dev/null
+++ b/games-arcade/njam/njam-1.25-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop flag-o-matic
+
+MY_P="${P}-src"
+DESCRIPTION="Multi or single-player network Pacman-like game in SDL"
+HOMEPAGE="http://njam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/njam/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/sdl-mixer
+ media-libs/sdl-image
+ media-libs/libsdl
+ media-libs/sdl-net"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:hiscore.dat:/var/${PN}/\0:" \
+ src/njam.cpp \
+ || die "sed failed"
+ sed -i \
+ -e "/hiscore.dat/ s:\$(DEFAULT_LIBDIR):/var:" \
+ Makefile.in \
+ || die "sed failed"
+
+ eapply "${FILESDIR}"/${P}-gcc45.patch
+ eapply "${FILESDIR}"/${P}-format-security.patch #542124
+
+ # njam segfaults on startup with -Os
+ replace-flags "-Os" "-O2"
+}
+
+src_install() {
+ default
+
+ HTML_DOCS="${ED}/usr/share/njam/html/*"
+ rm -rf "${ED}/usr/share/njam/html/"
+ rm -f "${ED}"/README "${ED}"/levels/readme.txt
+
+ newicon data/njamicon.bmp njam.bmp
+ make_desktop_entry njam Njam /usr/share/pixmaps/njam.bmp
+}