diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-04 03:10:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-04 03:10:11 +0000 |
| commit | d1dc60069e2d702237548c5dad89a52544ee321f (patch) | |
| tree | 6c6a196e89e792ab0a7b4f1b6304465f02b1a457 /games-kids | |
| parent | Stable on SPARC wrt bug #146155. (diff) | |
| download | gentoo-2-d1dc60069e2d702237548c5dad89a52544ee321f.tar.gz gentoo-2-d1dc60069e2d702237548c5dad89a52544ee321f.tar.bz2 gentoo-2-d1dc60069e2d702237548c5dad89a52544ee321f.zip | |
Fail graciously rather than segfaulting #142453 by Jon Hurst.
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'games-kids')
| -rw-r--r-- | games-kids/tuxtype2/ChangeLog | 8 | ||||
| -rw-r--r-- | games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 | 2 | ||||
| -rw-r--r-- | games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch | 18 | ||||
| -rw-r--r-- | games-kids/tuxtype2/tuxtype2-1.5.3.ebuild | 9 |
4 files changed, 31 insertions, 6 deletions
diff --git a/games-kids/tuxtype2/ChangeLog b/games-kids/tuxtype2/ChangeLog index 43b00504776d..dccbe4755711 100644 --- a/games-kids/tuxtype2/ChangeLog +++ b/games-kids/tuxtype2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-kids/tuxtype2 -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/ChangeLog,v 1.3 2005/05/15 01:25:41 luckyduck Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/ChangeLog,v 1.4 2006/09/04 03:10:11 vapier Exp $ + + 04 Sep 2006; Mike Frysinger <vapier@gentoo.org> + +files/tuxtype2-1.5.3-checks.patch, tuxtype2-1.5.3.ebuild: + Fail graciously rather than segfaulting #142453 by Jon Hurst. 15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tuxtype2-1.5.3.ebuild: stable on amd64 diff --git a/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 b/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 index 4c63a66fb9d1..e78c716ebd08 100644 --- a/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 +++ b/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 @@ -1 +1,3 @@ MD5 ca04e65d3b19ddeeedb8a49147ed642b tuxtype2-1.5.3.tar.bz2 7741487 +RMD160 8771796272f23b0d70b909b8953bed26da162571 tuxtype2-1.5.3.tar.bz2 7741487 +SHA256 f2a0cf5078690b0c309c4c7b65685cca2a68e28ddfbbdf7d1d50a5e80daef767 tuxtype2-1.5.3.tar.bz2 7741487 diff --git a/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch b/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch new file mode 100644 index 000000000000..315c2c28147d --- /dev/null +++ b/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch @@ -0,0 +1,18 @@ +--- tuxtype/alphabet.c ++++ tuxtype/alphabet.c +@@ -120,7 +120,15 @@ + DEBUGCODE { fprintf( stderr, "black_outline of \"%s\"\n", t ); } + + tmp = TTF_RenderText_Solid(font, t, black); ++ if (tmp == NULL) { ++ fprintf(stderr, "TTF_RenderText_Solid(%s) failed: %s\n", t, TTF_GetError()); ++ exit(1); ++ } + out = SDL_CreateRGBSurface(SDL_SWSURFACE, (tmp->w)+5, (tmp->h)+5, 32, rmask, gmask, bmask, amask); ++ if (out == NULL) { ++ fprintf(stderr, "SDL_CreateRGBSurface() failed: %s\n", SDL_GetError()); ++ exit(1); ++ } + + dstrect.w = tmp->w; + dstrect.h = tmp->h; diff --git a/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild b/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild index b1f0fec6dc13..0364fe5239f9 100644 --- a/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild +++ b/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild,v 1.4 2005/05/15 01:25:41 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild,v 1.5 2006/09/04 03:10:11 vapier Exp $ inherit games @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tuxtype/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="ppc sparc x86 amd64" +KEYWORDS="amd64 ppc sparc x86" IUSE="" DEPEND=">=media-libs/libsdl-1.2 @@ -20,7 +20,8 @@ DEPEND=">=media-libs/libsdl-1.2 src_unpack() { unpack ${A} - cd ${S} + cd "${S}" + epatch "${FILESDIR}"/tuxtype2-1.5.3-checks.patch sed -i \ -e 's:$(prefix)/share:'${GAMES_DATADIR}':g' \ -e 's:$(prefix)/doc/$(PACKAGE):/usr/share/doc/'${PF}':g' \ |