summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-08-07 06:45:58 +0000
committerChristoph Mende <angelos@gentoo.org>2011-08-07 06:45:58 +0000
commitda9850eab5d45435ea47d8abb8c3fb349d362b7c (patch)
tree461117ceb2e497c16fb8a199d3f90f37c8f2e7ea /games-roguelike/crossfire-client
parentFix building with libpng15 (diff)
downloadhistorical-da9850eab5d45435ea47d8abb8c3fb349d362b7c.tar.gz
historical-da9850eab5d45435ea47d8abb8c3fb349d362b7c.tar.bz2
historical-da9850eab5d45435ea47d8abb8c3fb349d362b7c.zip
Add missing curl dependency and fix compilation with curl-7.21.7 (bug #378035)
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64
Diffstat (limited to 'games-roguelike/crossfire-client')
-rw-r--r--games-roguelike/crossfire-client/ChangeLog8
-rw-r--r--games-roguelike/crossfire-client/Manifest13
-rw-r--r--games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild6
-rw-r--r--games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch12
4 files changed, 30 insertions, 9 deletions
diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 3e2bb8d0afc8..c63c07555fb6 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-roguelike/crossfire-client
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.25 2011/06/14 10:42:55 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.26 2011/08/07 06:45:58 angelos Exp $
+
+ 07 Aug 2011; Christoph Mende <angelos@gentoo.org>
+ crossfire-client-1.12.0.ebuild,
+ +files/crossfire-client-1.12.0-curl-headers.patch:
+ Add missing curl dependency and fix compilation with curl-7.21.7 (bug
+ #378035)
14 Jun 2011; Tupone Alfredo <tupone@gentoo.org>
crossfire-client-1.12.0.ebuild,
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index 161abd282e2c..8d8b4e5d147c 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -1,16 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
+AUX crossfire-client-1.12.0-curl-headers.patch 312 RMD160 51a90a8790210a89bb1a07f6853c3ee3af99ae45 SHA1 4fe8d1ff55b934b120284e4f923602d527af239c SHA256 f8756577998ffd2dae37420c6c6841e998ae7eaaa9e2c537ef648db3e7e9db68
AUX crossfire-client-1.12.0-lua.patch 568 RMD160 86ff822514108c82ed63e0ec1a112f7ded3967e5 SHA1 4b4dc514739d0dd0586c2f691d0a845967008ad9 SHA256 b1d02cb6e6b179696aa7b49b41761d2a309aba18c001739d56e06dac95978904
AUX crossfire-client-1.12.0-underlink.patch 474 RMD160 ef1d54f58c5f6f76375433c7d53dda28e6195686 SHA1 0f9a47a06f3e735169f8011e955763f64d803ac8 SHA256 fcf7c9db26027f25ef2b532cd9555deed5d512776c429b669ceb6e95f968e3d0
DIST crossfire-client-1.12.0.tar.bz2 823766 RMD160 21568bab022a4b3cdf4115f33fcfb1c8da0d2363 SHA1 7ec3db117084164cee7b9a42291874b4a7240662 SHA256 cfdbc11d06f00d53bde9620ed0a13b5fd54fc7fec4d11b4beaf2146c3cedf227
-EBUILD crossfire-client-1.12.0.ebuild 1639 RMD160 50fab9faf1c05e0e89fc29c269d9808f3fbc7ba3 SHA1 fde226c02f335cbde5e7ab96fcfb74db86b134aa SHA256 9a442a9b57df5385656d027aca9d542e84a865c8afad6d7c4e74d3ece07ba2f6
-MISC ChangeLog 4632 RMD160 9bfa4a739f94782adf661f3c351eb38f5b95fb07 SHA1 76537b384604475a29f4e4b083e77034e1082469 SHA256 2a6a95f95747240a345f1ec52b243e183d19218b449ba4078362612d2ac9359f
+EBUILD crossfire-client-1.12.0.ebuild 1697 RMD160 3bd83180a922429404be7180c3d63dab8bf4374f SHA1 3e747990beff89f280fd206d66a8ede1124c8a72 SHA256 bf5d793ce46ac7f2d6059c6638cd958ef054385cde7cb39ae0a062fc89546217
+MISC ChangeLog 4856 RMD160 dbb4c161371fa091f012b0be1434675c607e6a53 SHA1 42ac71eb6d47010e367df743ffb09b08bd6df80d SHA256 be02b4004a1088d0a59eba31dc16a32dbae7db9ed7f00a17a51d0462b27577fb
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk33OzwACgkQIY77eQFFFC0dlACfUPeVLddNEfiB5n9S86cHw3DY
-EI0An159dYIW2xkW9xFlnDxSb7IpMu96
-=ShIk
+iF4EAREIAAYFAk4+NJIACgkQmWq1bYTyC0OT2QEAiqtQ1Lps53D4F4qpRjdRGuOR
+7dw8p7MZTOm+JoO5A6MA/3iftgpvFbcUJMCsmQozsAp1EcICCD9gxVc2saG2T7CY
+=AiSU
-----END PGP SIGNATURE-----
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
index cd9332209ef5..daa676c5fdb5 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.12.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-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.6 2011/06/14 10:42:55 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.7 2011/08/07 06:45:58 angelos Exp $
EAPI=2
inherit eutils autotools games
@@ -18,6 +18,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
gtk? ( x11-libs/gtk+:2
sdl? ( media-libs/libsdl[video]
media-libs/sdl-image ) )
+ net-misc/curl
media-libs/freeglut
media-libs/libpng
sys-libs/zlib"
@@ -30,7 +31,8 @@ src_prepare() {
$(find . -name "*man") \
|| die "sed failed"
epatch "${FILESDIR}/${P}-lua.patch" \
- "${FILESDIR}"/${P}-underlink.patch
+ "${FILESDIR}"/${P}-underlink.patch \
+ "${FILESDIR}"/${P}-curl-headers.patch
eautoreconf
}
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch
new file mode 100644
index 000000000000..26f884da6ab2
--- /dev/null
+++ b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/common/metaserver.c b/common/metaserver.c
+index f963da6..0c75b11 100644
+--- a/common/metaserver.c
++++ b/common/metaserver.c
+@@ -47,7 +47,6 @@ const char * const rcsid_common_metaserver_c =
+
+ #ifdef HAVE_CURL_CURL_H
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+