From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- games-arcade/njam/Manifest | 5 ++- .../njam/files/njam-1.25-format-security.patch | 13 ++++++ games-arcade/njam/files/njam-1.25-gcc45.patch | 4 +- games-arcade/njam/njam-1.25-r1.ebuild | 52 ++++++++++++++++++++++ games-arcade/njam/njam-1.25.ebuild | 46 ------------------- 5 files changed, 70 insertions(+), 50 deletions(-) create mode 100644 games-arcade/njam/files/njam-1.25-format-security.patch create mode 100644 games-arcade/njam/njam-1.25-r1.ebuild delete mode 100644 games-arcade/njam/njam-1.25.ebuild (limited to 'games-arcade/njam') diff --git a/games-arcade/njam/Manifest b/games-arcade/njam/Manifest index 4012df50dc28..e7bcc39a6b7e 100644 --- a/games-arcade/njam/Manifest +++ b/games-arcade/njam/Manifest @@ -1,4 +1,5 @@ -AUX njam-1.25-gcc45.patch 666 BLAKE2B 7c26161911f289bffd47b34c2e8805cd979a1f2a172dc0ca0b3bee00447d8564da8dd6998406d3de8d0b5fb193df010da25127d2865592b6815895ca0e921518 SHA512 ed750f0b25f79271a262cf7935368bfdb52a8140f188c669b448db91e896e62e7d1e942ce72c4833baa6760cfe47e2d9d38ecc075c20e92b913dd948e5e613e9 +AUX njam-1.25-format-security.patch 499 BLAKE2B d960f3a2f45cf02cefa7bca36a55f3ed1bbfa8af43378d0610b3d4613f10e26207f0c2ce33664ae778e2dd6e3cac59bc9ba9a795f053421e5824c7fefa1dff53 SHA512 18ddb018ce34ca1e5658025147b5ad61f5a8b6308c79003fcf4bf6cb2e003bdc26322fb18d8aea648d4df047c1928dbe1302e1790d87bc8c71e0b7fa7e8ef1e4 +AUX njam-1.25-gcc45.patch 670 BLAKE2B 068369a02f7ea0a88b3742e575989289ca9b7309db0bf24013c12f0103d7f56f5dbdd390904910d2f671f822d70a1c61c0441ba9e8f27f30d66f7eab0adaf6b4 SHA512 93c9b554ad062c4d2fae70a61f13d7f5a2880b303ec04c05a14b92dac3d0c74711ad2360f05ebc7799fb8d48c59c1bdbff30448f7edbd5c589a8d060bcde2c09 DIST njam-1.25-src.tar.gz 1665803 BLAKE2B 7e505bd2b6d1d50046c98a3e0edbe5cdd4831ee8d8525562d2b85296f98881f7aaab7154c2482c24be88015a81dc82d3d1b89693d6e7cc16a163a6f342f3b5e3 SHA512 d19c249ade34ede322245718fbc6fc79c5a0ed5f5da50989f88de48410dda3d7ae29f8968185166dfdc1dd23dae8126efe4a5f3c76c3731b90afd1c798f66917 -EBUILD njam-1.25.ebuild 1127 BLAKE2B dcba8b9c8662a80bb1333960f967b3acfd4df00b29d50995d4b86908c99546c0505e9042dd533e2b9e05338ac16131446d9611f68edcfc55e00f24baabdddd39 SHA512 831eac045496a841de007753492e1481ed73373a85bf0786dab2edabe70289abee266339c14c81af3dd0375e9b2594d44a6680780e4aa7e474b1fde6b4e2cf59 +EBUILD njam-1.25-r1.ebuild 1140 BLAKE2B eae7fc402f766de7bcb952e21120252a460f24ec17e1bb604a1c0875b9cd5249e89fc9d3f96ab701cbb7707adee1a290b24da402f687b4b88d0973cc9b292854 SHA512 97c11e0e54f3d9e5fa9943ebe13a4e438f2e70610cdf5f8ff4446e7c40901f735984b31836dad00689e52a74d53876fabe5b00636a7652144e7deac7d775ba5c MISC metadata.xml 327 BLAKE2B 165132496b7120650cde5669a05c9ec7b34a5a6432678a3f54f4ef0f6ebdc2941b56a201f6d49e6b5444ec09825fe3b8bf546d7cf091312ece4a06c1dff04840 SHA512 027848c8ee1cd2adbc90422ab871e50bee2c7fd87aa87fba19208d3814410455177cd722a0a305bb02d911bc380a90901cf65df25ddf037cc48cdc2799d8fb21 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 +} diff --git a/games-arcade/njam/njam-1.25.ebuild b/games-arcade/njam/njam-1.25.ebuild deleted file mode 100644 index 35681f65d97d..000000000000 --- a/games-arcade/njam/njam-1.25.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic games - -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() { - sed -i \ - -e "s:hiscore.dat:${GAMES_STATEDIR}/${PN}/\0:" \ - src/njam.cpp \ - || die "sed failed" - sed -i \ - -e "/hiscore.dat/ s:\$(DEFAULT_LIBDIR):${GAMES_STATEDIR}:" \ - Makefile.in \ - || die "sed failed" - epatch "${FILESDIR}"/${P}-gcc45.patch - # njam segfaults on startup with -Os - replace-flags "-Os" "-O2" -} - -src_install() { - dodir "${GAMES_STATEDIR}/${PN}" - emake DESTDIR="${D}" install - dohtml -r "${D}${GAMES_DATADIR}/njam/html/"* - rm -rf "${D}${GAMES_DATADIR}/njam/html/" - newicon data/njamicon.bmp njam.bmp - make_desktop_entry njam Njam /usr/share/pixmaps/njam.bmp - prepgamesdirs -} -- cgit v1.2.3