diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:53:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:53:41 +0000 |
| commit | 89a0e723e0e65962d70c8b7f5fffe072227e4c85 (patch) | |
| tree | 519df6a0c60c610e879a7924e58fbee4c6ed9caf /games-rpg/freedroidrpg | |
| parent | Fix building with libpng15 wrt #380145 by Diego Elio Pettenò (diff) | |
| download | historical-89a0e723e0e65962d70c8b7f5fffe072227e4c85.tar.gz historical-89a0e723e0e65962d70c8b7f5fffe072227e4c85.tar.bz2 historical-89a0e723e0e65962d70c8b7f5fffe072227e4c85.zip | |
Fix building with libpng15 wrt #378239 by Diego Elio Pettenò
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'games-rpg/freedroidrpg')
| -rw-r--r-- | games-rpg/freedroidrpg/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/freedroidrpg/Manifest | 15 | ||||
| -rw-r--r-- | games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch | 11 | ||||
| -rw-r--r-- | games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild | 6 |
4 files changed, 33 insertions, 5 deletions
diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog index e3bf3b35993a..b30e6120ac16 100644 --- a/games-rpg/freedroidrpg/ChangeLog +++ b/games-rpg/freedroidrpg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/freedroidrpg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.30 2011/01/15 15:06:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.31 2011/09/15 02:53:41 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + freedroidrpg-0.14.1.ebuild, +files/freedroidrpg-0.14.1-libpng15.patch: + Fix building with libpng15 wrt #378239 by Diego Elio Pettenò 15 Jan 2011; Markus Meier <maekke@gentoo.org> freedroidrpg-0.14.1.ebuild: x86 stable, bug #350769 diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest index 3bc9858a72cb..bcd9b55b22c1 100644 --- a/games-rpg/freedroidrpg/Manifest +++ b/games-rpg/freedroidrpg/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX freedroidrpg-0.14.1-libpng15.patch 243 RMD160 f0bba0d0f8bdce242d57744a671d84e79e6c7a47 SHA1 7bc04960158c21ac3f60be2537b3d8b68cb1849f SHA256 6cd15f659726065beeb3d3883255241394623699ebd40125a159fd7cb25342b5 AUX freedroidrpg-0.14.1-syslibs.patch 3464 RMD160 2be0d73a254425c5f9294eef07e3ca825437bbe6 SHA1 a8e4ee8330dc293d829531f0ebedb94c87d4b25b SHA256 01c7097f6bb4927261b9c95912aabba9b499d331ced3869852c01d4b3c7ba5c6 DIST freedroidrpg-0.14.1.tar.gz 161715770 RMD160 fc85e688097d1700014f62f6f16629f0418095f0 SHA1 8e254098584d394d474ed81dd48bf3c028b9c56b SHA256 f5a862dda68147e5d3899a781a144e8adb1bd604f40f0edb8ba2f4602bd77ae0 -EBUILD freedroidrpg-0.14.1.ebuild 1536 RMD160 9becf256432e374447786a6b9070849cc002a67d SHA1 3fd013a8dc324f25583530c39451a51128888f13 SHA256 c0677f29456a0ad714c938a924ad33d2cbc0ef86d85dbc6195725e232c2c5dd7 -MISC ChangeLog 4203 RMD160 95222cda218d1ea809641cbafc5af8f3058e957a SHA1 c8560bfe016c5d54196994f743aa663db51e227b SHA256 28bd50116941dd2ecd018ba7d8b153cc53237e9f764c223a6942454aef9afd41 +EBUILD freedroidrpg-0.14.1.ebuild 1581 RMD160 de30e4064ec671f668131a0cfeff676d751e417a SHA1 28491b4170060e5286fee4edf4a486d0191455a2 SHA256 b1dcd52c9d01aa50227ea197e6856276cdd5b104b2efc0cee1f7ea0f50340077 +MISC ChangeLog 4398 RMD160 d7a6e8a808023e1b2d26fcf0a8e71f5e2ca63b77 SHA1 96c81186eb4b04083fee06a3b309cac9119b092f SHA256 c733463da4c96545cd8a3e0c20400bdb284d9fd2a4df3ff1bba94f8e4bee6c6e MISC metadata.xml 2102 RMD160 b4460164b2f9e4bc4cc206fcb7a688afa6f127b7 SHA1 aaa79dbac1d09bda7e33de3cdaaf749ce2c1f0ad SHA256 d06c8ed4ae0f0763859351dfebfad1b41e3d054261fa555ba26e67be0f7b60f1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5xaO0ACgkQXkR9YqOcLPFF9wEAnMhj+KvXC93/TJz3Pne/LFTC +GTrqnIocmeDEu7z7qRIA/jIdPPqgTdAm63v/omMGuA1IqXh+f4UhOTWJKDi3B/o5 +=+CnR +-----END PGP SIGNATURE----- diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch new file mode 100644 index 000000000000..1c61a3a43ab2 --- /dev/null +++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch @@ -0,0 +1,11 @@ +--- win32/pngtoico.c ++++ win32/pngtoico.c +@@ -188,7 +188,7 @@ + goto perrexit; + } + +- if ( setjmp(png_ptr->jmpbuf) ) { ++ if ( setjmp(png_jmpbuf(png_ptr)) ) { + fprintf(stderr, "%s: PNG format error\n", file); + goto errexit; + } diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild index a1eca4e30a0f..3f9d38a74afe 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild +++ b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild,v 1.4 2011/01/15 15:06:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild,v 1.5 2011/09/15 02:53:41 ssuominen Exp $ EAPI=2 PYTHON_DEPEND="2" @@ -38,7 +38,9 @@ pkg_setup() { src_prepare() { rm -rf lua src/SDL_rotozoom* - epatch "${FILESDIR}"/${P}-syslibs.patch + epatch \ + "${FILESDIR}"/${P}-syslibs.patch \ + "${FILESDIR}"/${P}-libpng15.patch python_convert_shebangs -r 2 . |