From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-arcade/abe/Manifest | 7 ++ games-arcade/abe/abe-1.1-r1.ebuild | 64 ++++++++++++++++ games-arcade/abe/files/abe-1.1-doublefree.patch | 11 +++ .../abe/files/abe-1.1-format-security.patch | 87 ++++++++++++++++++++++ games-arcade/abe/files/abe-1.1-format.patch | 11 +++ games-arcade/abe/files/abe-1.1-settings.patch | 12 +++ games-arcade/abe/metadata.xml | 11 +++ 7 files changed, 203 insertions(+) create mode 100644 games-arcade/abe/Manifest create mode 100644 games-arcade/abe/abe-1.1-r1.ebuild create mode 100644 games-arcade/abe/files/abe-1.1-doublefree.patch create mode 100644 games-arcade/abe/files/abe-1.1-format-security.patch create mode 100644 games-arcade/abe/files/abe-1.1-format.patch create mode 100644 games-arcade/abe/files/abe-1.1-settings.patch create mode 100644 games-arcade/abe/metadata.xml (limited to 'games-arcade/abe') diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest new file mode 100644 index 000000000000..db8c3ca31be0 --- /dev/null +++ b/games-arcade/abe/Manifest @@ -0,0 +1,7 @@ +AUX abe-1.1-doublefree.patch 250 BLAKE2B 8d39ae1dd2ba1cc77f3bddc726f6811c232ee30a094531b394e54e6be96af73e280ee4934344d980a7638a545e0e1817ff7b6296f3820475e3394f2b546228eb SHA512 ca3091783c409a02a0aedf22e41829ff9198b2385cf474f9b365d4acdc2806a1ee952741816df7e658e5c48282b45d5e7577db9def01eb24448d5c579c5985ca +AUX abe-1.1-format-security.patch 2601 BLAKE2B b918881d0de19eafca8da7a9cc47efdc52bfdc68e5f5c75591093db3045fe2bd47872b0f7e73b3c734de49e38b6d45ec9b268c60bfe14cf0690bac321469232e SHA512 9750a765fc46d70c9b322a7ddc363b4680a6f16ebc9a9ccd0c164d7cb61fa4618969db31d9fdf26d5fa993ac2a285db09a67563c5b286131981bc7f3e9a37712 +AUX abe-1.1-format.patch 506 BLAKE2B 9c91f56e58701d26b3a5809b6a764bd1acc38f4628849171f06d61e2eec1f9ffb3076f0e35c4dd26199f110c679a8c66c4a05d297a1d62d3845cb28e47ee642c SHA512 e0ddbaad3034ab28198ddf8fd7cbebc0648c1a4d30e4d597c90fe3c9327194de579da92d5acbd1a6ab99a50f11c8967f4a5cdda00776f404175f060f8e210c24 +AUX abe-1.1-settings.patch 336 BLAKE2B 093ab417049ce54d012557fd7df9dc59ebd6e6095b0983d465aba0813ae6bfbd2c1c76e5d82bd734481781289c26619ef4bd4cb3651b08655030d36adbb35e4e SHA512 a609ec800165859854a132cca4dc1a12407746b832eae2326889212bcf155076f89ceb980e9cf6c678cdd9f160368c915e617d72b7d26bde2ec7fb23a7c05218 +DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7 +EBUILD abe-1.1-r1.ebuild 1625 BLAKE2B f7a432819a6ab0f18979e394b21ddab7a720dac6d6170286def241e5c362e719ce9d14b19b262114fe33cb76dcc400d8261ec52334942438f3fcdcde519b21fc SHA512 99c54f52d343cc759ce3238e56b96e743d1c7f03ecabe4d088326a3fd31234947024c563722b3db0c88696ea53875721e8d2ba34ef1115a0bd7e1679192594f2 +MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788 diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild new file mode 100644 index 000000000000..25fb312e3b54 --- /dev/null +++ b/games-arcade/abe/abe-1.1-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop toolchain-funcs + +DESCRIPTION="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" +HOMEPAGE="http://abe.sourceforge.net/" +SRC_URI="mirror://sourceforge/abe/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="media-libs/libsdl[sound,video] + x11-libs/libXi + media-libs/sdl-mixer[vorbis]" +RDEPEND=${DEPEND} + +src_unpack() { + unpack ${A} + cd "${S}" + unpack ./images/images.tar +} + +PATCHES=( + # From Fedora: + # Enable changing the video settings. Sent upstream 2 Apr 2006: + # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743 + "${FILESDIR}"/${P}-settings.patch + + # Fix a double free() bug. Sent upstream 15 Mar 2011: + # https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745 + "${FILESDIR}"/${P}-doublefree.patch + + # Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011: + # https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745 + "${FILESDIR}"/${P}-format.patch + + # Fix build failure with -Werror=format-security + "${FILESDIR}"/${P}-format-security.patch +) + +src_prepare() { + default + sed -i \ + -e "/^TR_CFLAGS/d" \ + -e "/^TR_CXXFLAGS/d" \ + configure || die +} + +src_configure() { + econf --with-data-dir=/usr/share/${PN} +} + +src_install() { + dobin src/abe + insinto /usr/share/${PN} + doins -r images sounds maps + newicon tom1.bmp abe.bmp + make_desktop_entry abe "Abe's Amazing Adventure" /usr/share/pixmaps/abe.bmp + einstalldocs +} diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch new file mode 100644 index 000000000000..ce7389d97100 --- /dev/null +++ b/games-arcade/abe/files/abe-1.1-doublefree.patch @@ -0,0 +1,11 @@ +--- a/src/Main.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ b/src/Main.c 2011-03-14 10:08:31.846413904 -0600 +@@ -35,8 +35,6 @@ + for(i = 0; modes[i]; ++i) + printf("\t%d x %d\n", modes[i]->w, modes[i]->h); + } +- +- free(modes); + } + + void diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch new file mode 100644 index 000000000000..ad88b4b60486 --- /dev/null +++ b/games-arcade/abe/files/abe-1.1-format-security.patch @@ -0,0 +1,87 @@ +--- ./src/Game.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ ./src/Game.c 2013-11-20 12:30:00.000000000 -0700 +@@ -6,21 +6,14 @@ Game game; + + // path_sprintf should not be used by other .c files, as it does not fit for them. + static void +-path_sprintf(char *path, char *formatted_name, int version) ++path_sprintf(char *path, const char *name, int version) + { +- +- int len; +- +- printf("path_sprintf (%p, %s, %d)\n", path, formatted_name, version); +- +- strcpy(path, getSaveGameDir()); +- +- len = strlen(path); +- + if(1 == version) { +- sprintf(path + len, formatted_name); ++ printf("path_sprintf (%p, %s.dat, %d)\n", path, name, version); ++ sprintf(path, "%s%s.dat", getSaveGameDir(), name); + } else { +- sprintf(path + len, formatted_name, version); ++ printf("path_sprintf (%p, %s%d.dat, %d)\n", path, name, version, version); ++ sprintf(path, "%s%s%d.dat", getSaveGameDir(), name, version); + } + + } +@@ -30,14 +23,14 @@ deleteSavedGame() + { + char path[PATH_SIZE]; + // version 2 +- path_sprintf(path, "save%d.dat", GAME_VERSION); ++ path_sprintf(path, "save", GAME_VERSION); + remove(path); +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + remove(path); + // version 1 +- path_sprintf(path, "save.dat", 1); ++ path_sprintf(path, "save", 1); + remove(path); +- path_sprintf(path, "savedmap.dat", 1); ++ path_sprintf(path, "savedmap", 1); + remove(path); + } + +@@ -51,7 +44,7 @@ saveGame() + + mkshuae(); + +- path_sprintf(path, "save%d.dat", GAME_VERSION); ++ path_sprintf(path, "save", GAME_VERSION); + + if(!(fp = fopen(path, "wb"))) { + err = strerror(errno); +@@ -79,7 +72,7 @@ saveGame() + SDL_RWclose(rwop); + + // save the map +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + saveMapPath(path); + } + +@@ -96,7 +89,7 @@ loadGame() + version = (int) GAME_VERSION; + + // load the map +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + if(!loadMapPath(path, 0)) { + // if can't find saved map load static map + fprintf(stderr, +@@ -112,9 +105,9 @@ loadGame() + // try to find a saved game of any version + while(version > 0) { + if(version > 1) { +- path_sprintf(path, "save%d.dat", version); ++ path_sprintf(path, "save", version); + } else { // By Pedro: version==1 +- path_sprintf(path, "save.dat", version); ++ path_sprintf(path, "save", version); + } + fprintf(stderr, "Trying to load saved game: %s\n", path); + fflush(stderr); diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch new file mode 100644 index 000000000000..529534745712 --- /dev/null +++ b/games-arcade/abe/files/abe-1.1-format.patch @@ -0,0 +1,11 @@ +--- a/src/MapIO.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ b/src/MapIO.c 2011-03-14 10:15:33.166949366 -0600 +@@ -93,7 +93,7 @@ + // compression step 1: read compressed data from disk + // FIXME: what would be nicer is to only allocate as much mem as used on disk. + size = LEVEL_COUNT * map.w * map.h; +- printf("size %u\n", size); ++ printf("size %zu\n", size); + fflush(stdout); + if(!(read_buff = (Uint16 *) malloc(sizeof(Uint16) * size))) { + fprintf(stderr, "Out of memory on map read."); diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch new file mode 100644 index 000000000000..ea5809f7386a --- /dev/null +++ b/games-arcade/abe/files/abe-1.1-settings.patch @@ -0,0 +1,12 @@ +diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c +--- abe-1.1/src/Menu.c 2005-03-05 08:20:04.000000000 -0800 ++++ abe-1.1.new/src/Menu.c 2006-04-02 15:04:37.000000000 -0700 +@@ -116,7 +116,7 @@ + if(n == SOUND_ENABLED || n == MUSIC_ENABLED) + return sound_loaded; + else +- return 0; ++ return 1; + } + + void diff --git a/games-arcade/abe/metadata.xml b/games-arcade/abe/metadata.xml new file mode 100644 index 000000000000..e9edf695246f --- /dev/null +++ b/games-arcade/abe/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + abe + + -- cgit v1.2.3