diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-10-10 14:40:21 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-10-10 14:40:21 +0000 |
| commit | 9853d70ad9ecea9ce2ea0fcf6e2e667c99c0aaaa (patch) | |
| tree | 850cbc32a3639f34f4ee1158ce9325d571e5416c /games-server/crossfire-server | |
| parent | Drop handbook useflag, doc is just empty folder and it confuses the unpack. W... (diff) | |
| download | gentoo-2-9853d70ad9ecea9ce2ea0fcf6e2e667c99c0aaaa.tar.gz gentoo-2-9853d70ad9ecea9ce2ea0fcf6e2e667c99c0aaaa.tar.bz2 gentoo-2-9853d70ad9ecea9ce2ea0fcf6e2e667c99c0aaaa.zip | |
Build with newer net-misc/curl. Bug #383217
(Portage version: 2.1.10.24/cvs/Linux i686)
Diffstat (limited to 'games-server/crossfire-server')
3 files changed, 19 insertions, 3 deletions
diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog index 5f4bccb7be92..425d1d814295 100644 --- a/games-server/crossfire-server/ChangeLog +++ b/games-server/crossfire-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-server/crossfire-server # 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 $ +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.19 2011/10/10 14:40:21 tupone Exp $ + + 10 Oct 2011; Tupone Alfredo <tupone@gentoo.org> + crossfire-server-1.11.0.ebuild, +files/crossfire-server-1.11.0-curl.patch: + Build with newer net-misc/curl. Bug #383217 by Diego Elio Pettenò 21 Feb 2011; Tupone Alfredo <tupone@gentoo.org> crossfire-server-1.11.0.ebuild, 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 e0b4fdd7fe02..d7956cc0f62d 100644 --- a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild +++ b/games-server/crossfire-server/crossfire-server-1.11.0.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-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.7 2011/04/28 07:46:47 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.8 2011/10/10 14:40:21 tupone Exp $ EAPI=2 inherit eutils autotools games @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ppc x86" IUSE="X" DEPEND=" + net-misc/curl X? ( x11-libs/libXaw media-libs/libpng )" @@ -24,7 +25,8 @@ DEPEND=" S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch + epatch "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-curl.patch sed -i \ -e 's/make /$(MAKE) /' \ $(find . -name Makefile.am) \ diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch new file mode 100644 index 000000000000..86365d2ee85b --- /dev/null +++ b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch @@ -0,0 +1,10 @@ +--- socket/metaserver.c.old 2011-10-10 16:23:40.513409319 +0200 ++++ socket/metaserver.c 2011-10-10 16:23:46.617408594 +0200 +@@ -48,7 +48,6 @@ + + #ifdef HAVE_CURL_CURL_H + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + #endif + |