diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-02-21 14:17:21 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-02-21 14:17:21 +0000 |
| commit | bc6ae98ecf37c3adaf111c48083d2ce272649a2c (patch) | |
| tree | 765da54d71166e3fe1d3a00a47ab952dbf9d325d /games-server | |
| parent | aalib, sdl and vaapi require X too (diff) | |
| download | historical-bc6ae98ecf37c3adaf111c48083d2ce272649a2c.tar.gz historical-bc6ae98ecf37c3adaf111c48083d2ce272649a2c.tar.bz2 historical-bc6ae98ecf37c3adaf111c48083d2ce272649a2c.zip | |
Fix build with media-libs/libpng-1.5 Bug #355123
Package-Manager: portage-2.1.9.40/cvs/Linux i686
Diffstat (limited to 'games-server')
4 files changed, 26 insertions, 7 deletions
diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog index 7bbc2c289ca8..5f4bccb7be92 100644 --- a/games-server/crossfire-server/ChangeLog +++ b/games-server/crossfire-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-server/crossfire-server -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.17 2010/03/24 14:15:39 ranger Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.18 2011/02/21 14:17:21 tupone Exp $ + + 21 Feb 2011; Tupone Alfredo <tupone@gentoo.org> + crossfire-server-1.11.0.ebuild, + +files/crossfire-server-1.11.0-libpng15.patch: + Fix build with media-libs/libpng-1.5 Bug #355123 by Lars Wendler 24 Mar 2010; Brent Baude <ranger@gentoo.org> crossfire-server-1.11.0.ebuild: diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest index 8faaa3bb5d63..f171ba289b21 100644 --- a/games-server/crossfire-server/Manifest +++ b/games-server/crossfire-server/Manifest @@ -1,5 +1,6 @@ +AUX crossfire-server-1.11.0-libpng15.patch 386 RMD160 1e3beabb9fc24d21ecaf453fa74e622a4eabaca7 SHA1 a9544fc1a991e25adc44f8d0c7b1f916c2b2d6ee SHA256 7f5c391d0323e9abe9ae2d8ad7ffc381408af75d9ef59f6262f882aed7b8bfc0 DIST crossfire-1.11.0.maps.tar.gz 24675542 RMD160 4defb41bed63c87d92840c9cc130041450dce078 SHA1 bd72ebe276a3c2f589c4505543ca4123b7caf575 SHA256 848dc10e292f0e4812f9ec4cd802375da8e18df7648d090942e484bbde94b08b DIST crossfire-1.11.0.tar.gz 6302656 RMD160 c71c429896ccfecc98b5f52559377bb01b33c1c0 SHA1 5ba3f6e8ac39f7d02cf2d133ed6069c789502c25 SHA256 ad259903d37ddecbfc69507f01e5bfcf5c3f847fd22e711b1cc7df2d47ad222c -EBUILD crossfire-server-1.11.0.ebuild 1314 RMD160 02422eb9746e7f06349a87d77908cb6b843e9b07 SHA1 61579d9e46cd597df58041e13ff0528202f137e5 SHA256 64b3363ac219621b4ec3d966765248ce7510ccfd9c2fa933755540414bf308e8 -MISC ChangeLog 2493 RMD160 7c71622c7acf6bfa7fb9aaa8674548a35bd1d9d3 SHA1 9ff0ddeef7d5f0bed588a951a6d34f3a5065147d SHA256 57ec37dc7c30e07e1123c4eff1d6c6e0df4ff2635d21ffeb951ce82de9b0a011 +EBUILD crossfire-server-1.11.0.ebuild 1383 RMD160 6201f114369b9e560dd15a4709c75168e564185a SHA1 f6a4415019ffccc015d749873dff09fa15712ed4 SHA256 bf4436feb6dec586695793e22557014d4c7b549ff95fb96ceb612720e31597b2 +MISC ChangeLog 2694 RMD160 1242ecd8ec11735a3c65eac64e4b62f640a14084 SHA1 2efb2ca3dc6252718f2ff73db80a1852922f5868 SHA256 c737a452c0706a9f9f3cdc6b74f089b8e18ae5741793e8ed1b8962251b619169 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild index 2ca15aaf91c2..de2510025462 100644 --- a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild +++ b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.5 2010/03/24 14:15:39 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.6 2011/02/21 14:17:21 tupone Exp $ EAPI=2 -inherit autotools games +inherit eutils autotools games MY_P="${P/-server/}" DESCRIPTION="server for the crossfire clients" @@ -20,10 +20,12 @@ DEPEND=" X? ( x11-libs/libXaw media-libs/libpng )" +RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e 's/make /$(MAKE) /' \ $(find . -name Makefile.am) \ diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch new file mode 100644 index 000000000000..93841e518db5 --- /dev/null +++ b/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch @@ -0,0 +1,11 @@ +--- crossedit/png.c.old 2011-02-21 14:50:43.000000000 +0100 ++++ crossedit/png.c 2011-02-21 14:51:20.000000000 +0100 +@@ -269,7 +269,7 @@ + png_destroy_read_struct (&png_ptr, &info_ptr, NULL); + return PNGX_OUTOFMEM; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return PNGX_DATA; + } |