diff options
Diffstat (limited to 'games-arcade/blobwars')
| -rw-r--r-- | games-arcade/blobwars/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/blobwars/Manifest | 19 | ||||
| -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 |
4 files changed, 52 insertions, 17 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/Manifest b/games-arcade/blobwars/Manifest index 5e4020f9617f..477d96d9e404 100644 --- a/games-arcade/blobwars/Manifest +++ b/games-arcade/blobwars/Manifest @@ -1,16 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX blobwars-1.19-ldflags.patch 594 RMD160 d50b1e1947346eaa4140e20ed5886cfa94be359b SHA1 83766074fd0b609f122224ac42ab6c1a45b4b3c6 SHA256 5b695245189a7fa8916027e83bbbe1994e9c36eb2800341abd92254625c454c2 AUX blobwars-1.19-linking-order.patch 883 RMD160 df1395b7787257ad78ded386b5ed22549669a3d3 SHA1 aa0b66bf5d684462094d66094e9e78d9ed82b0a4 SHA256 c22d0eaba53d685a6d81e531f1090e978288642fe8e080a311edbe98827f1eff +AUX blobwars-1.19-zlib-1.2.5.2.patch 419 RMD160 3a736cf5a07e73f1f9c1bc05dabdd94940796b25 SHA1 a463b093803a178aa7f387bc00fde70dd60207bf SHA256 a79f578eed86ffdb569037a8fc81e756be349c5848326ed627e38a8e6215a874 DIST blobwars-1.19.tar.gz 67019647 RMD160 39a2bf865e7c2af97dcb2d26e06604e8d1fcc62f SHA1 4fb40c133ad8ad6536d96ee33b2750130892590e SHA256 f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed -EBUILD blobwars-1.19.ebuild 1881 RMD160 afa4a9790d819553f66eae2c7a6359f6754a6ee1 SHA1 7a1710c15ef01fb10d69ed55cfb226a3e835f744 SHA256 ce3a1854b2e0330b60d77fc153543241c3babd8d8cc444a0793d2f4c48458c63 -MISC ChangeLog 779 RMD160 5674335ad781b794a0b73820ffffa5d56ab589b6 SHA1 352ab7c6d3327f152e227b05acdcd7d3e77f7693 SHA256 a9cf2ddd7ec3eeacb17ebd9dc00220efec0d35bd1f006906827efcb461ffab82 +EBUILD blobwars-1.19.ebuild 1850 RMD160 59b1fa255f5bbceab622ea401a80ef2c60c5c6b9 SHA1 18b1debad025ad4dd0b04b10c9443550d79a2d60 SHA256 f91f8aea5dd80b09d6f288ca97915ae9294f066841ba94264c5bbdf47ac68d10 +MISC ChangeLog 974 RMD160 7a8d7b3878923bbaed012f883a78c125c539f967 SHA1 0aece0866409eb604da6c6f310fd95ad562461b1 SHA256 44b81c41b764a35800aec9f78ef46a4716d6aa9e517137cb6f116c5bddd139cd MISC metadata.xml 249 RMD160 609d07b497bd0c17071cb795379970594269d7b2 SHA1 5b007cb8fb4140e6ad1eafa1048f437eb9984c30 SHA256 963b9973135a20a4533403c147a66a43cb7dd2738523a7f3fd93e20e01459aaa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk8EjoMACgkQuUQtlDBCeQIO/ACaAtOmvS0gJ14gO8DZzIO+vV8a -2P4An3yqIIB396qJPanN2BKwLM4V6kNS -=2ftn +iQEcBAEBAgAGBQJPZL9lAAoJEEdUh39IaPFNKLEIAIntvwP5WXcE9Nlh2bLzog45 +mx//mdGAUUDVs36GMMYWJ5v/AGrYGDsCOn5xS1XFBPTx2OlXplh5K67L9amJrQfE +6P1fzMEUVwGeNhvc0UiWo2IAd5BUld9o/dUD0eRsAlZAut0JeZKXURF+5SxMmbYP ++HT8KLwfh1TWl2PGMowCFlrLTiVDJR0Pw1IxtQRRPhVnIrq6LauqTVuU7r25Wer1 +y3dz6i374zvjmnI+st13vhh6HyDAvYLc8S2wz3RN2oIz+kW5WGrBhSmzg7Jze6pM +OZxmMGPYkYXYxgmAO1VptcLqi2WIJwW6M6vDKJ/7Hw7nvaL8Cuz30ChpHrn2Sf0= +=kk7Y -----END PGP SIGNATURE----- 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 |