diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-03-17 16:44:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-17 16:44:32 +0000 |
| commit | 4cc9be2ccd4afcbead0d405c78bcdb8b2a7eb56b (patch) | |
| tree | 8ad4b76e3bca46e9afac81a7ee427df5de1a0598 /games-arcade | |
| parent | Stop applying -libpng-1.5.patch because upstream commit http://github.com/xbm... (diff) | |
| download | gentoo-2-4cc9be2ccd4afcbead0d405c78bcdb8b2a7eb56b.tar.gz gentoo-2-4cc9be2ccd4afcbead0d405c78bcdb8b2a7eb56b.tar.bz2 gentoo-2-4cc9be2ccd4afcbead0d405c78bcdb8b2a7eb56b.zip | |
Fix building with sys-libs/zlib >= 1.2.5.2 wrt #408459 by Piotr Szymaniak
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/blobwars/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/blobwars/blobwars-1.19.ebuild | 22 | ||||
| -rw-r--r-- | games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch | 22 |
3 files changed, 40 insertions, 10 deletions
diff --git a/games-arcade/blobwars/ChangeLog b/games-arcade/blobwars/ChangeLog index cd80e32a5a90..cfa7324bf7e3 100644 --- a/games-arcade/blobwars/ChangeLog +++ b/games-arcade/blobwars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/blobwars # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.43 2012/01/04 17:38:04 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.44 2012/03/17 16:44:32 ssuominen Exp $ + + 17 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> blobwars-1.19.ebuild, + +files/blobwars-1.19-zlib-1.2.5.2.patch: + Fix building with sys-libs/zlib >= 1.2.5.2 wrt #408459 by Piotr Szymaniak 04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> blobwars-1.19.ebuild: x86 stable wrt bug #394435 diff --git a/games-arcade/blobwars/blobwars-1.19.ebuild b/games-arcade/blobwars/blobwars-1.19.ebuild index 6d73b31cf918..28befaf19597 100644 --- a/games-arcade/blobwars/blobwars-1.19.ebuild +++ b/games-arcade/blobwars/blobwars-1.19.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/blobwars-1.19.ebuild,v 1.4 2012/01/04 17:38:04 phajdan.jr Exp $ - -EAPI="3" +# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/blobwars-1.19.ebuild,v 1.5 2012/03/17 16:44:32 ssuominen Exp $ +EAPI=2 inherit eutils gnome2-utils games DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader" @@ -26,8 +25,11 @@ DEPEND="${RDEPEND} sys-devel/gettext" src_prepare() { - epatch "${FILESDIR}/${PN}-1.19-linking-order.patch" - epatch "${FILESDIR}/${PN}-1.19-ldflags.patch" + epatch \ + "${FILESDIR}"/${PN}-1.19-linking-order.patch \ + "${FILESDIR}"/${PN}-1.19-ldflags.patch \ + "${FILESDIR}"/${PN}-1.19-zlib-1.2.5.2.patch + sed -i -e "/-Werror/d" makefile || die } @@ -49,11 +51,13 @@ src_install() { ICONDIR="/usr/share/icons/hicolor/" \ DESKTOPDIR="/usr/share/applications/" \ LOCALEDIR="/usr/share/locale/" \ - install || die + install || die + + mv -vf \ + "${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \ + "${D}"/usr/share/doc/${PF}/ + prepalldocs - # now make the docs Gentoo friendly. - dodoc "${ED}/usr/share/doc/${PF}/html/"{changes,hacking,porting,readme} || die - rm -f "${ED}/usr/share/doc/${PF}/html/"{changes,hacking,porting,readme} || die prepgamesdirs } diff --git a/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch b/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch new file mode 100644 index 000000000000..cf101170e26c --- /dev/null +++ b/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/408459 + +--- src/pak.cpp ++++ src/pak.cpp +@@ -119,7 +119,7 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + +@@ -141,7 +141,7 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + else |