From 423136000466b776fd55056e9c952e8ad0e7636e Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Fri, 16 Feb 2007 20:09:03 +0000 Subject: [PATCH] Fixing compilation for amd64 Package-Manager: portage-2.1.1-r2 --- dev-games/cel/ChangeLog | 6 +++++- dev-games/cel/Manifest | 28 ++++++++++++++----------- dev-games/cel/cel-1.0.ebuild | 8 ++++++- dev-games/cel/files/cel-1.0-amd64.patch | 25 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 dev-games/cel/files/cel-1.0-amd64.patch diff --git a/dev-games/cel/ChangeLog b/dev-games/cel/ChangeLog index b0afefc45a9d..53aaef506642 100644 --- a/dev-games/cel/ChangeLog +++ b/dev-games/cel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/cel # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/ChangeLog,v 1.16 2007/02/03 00:01:56 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/ChangeLog,v 1.17 2007/02/16 20:09:03 tupone Exp $ + + 16 Feb 2007; +files/cel-1.0-amd64.patch, + cel-1.0.ebuild: + Fixing compilation for amd64 *cel-1.0 (03 Feb 2007) diff --git a/dev-games/cel/Manifest b/dev-games/cel/Manifest index f9c038372599..4badcefc1dc4 100644 --- a/dev-games/cel/Manifest +++ b/dev-games/cel/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX cel-1.0-amd64.patch 1199 RMD160 925a1e280e8e1fcbb8219347407bdeb4734f74bd SHA1 77e28b8222c136bf0eaf20b1c4ffb6f26a427381 SHA256 970adfd49674a4f69443e8e93ad1f394c077e42082df0e7a1ac01bf5b35858c1 +MD5 fc552cba67e63bb9374e5325cac0783f files/cel-1.0-amd64.patch 1199 +RMD160 925a1e280e8e1fcbb8219347407bdeb4734f74bd files/cel-1.0-amd64.patch 1199 +SHA256 970adfd49674a4f69443e8e93ad1f394c077e42082df0e7a1ac01bf5b35858c1 files/cel-1.0-amd64.patch 1199 DIST cel-src-1.0.tar.bz2 4678519 RMD160 e1be33de7b03a7c27df51059dc833e924fa24af2 SHA1 b110943a4f9955d65979b430b35bd8f50001fd2b SHA256 11c862277982eb7f56af76b11e656e1830c5c38faa1be5fa56fa3e8b220cb95a DIST cel98_002.tar.bz2 1700527 RMD160 ddb74702fdea4717fc7b362ca313a3503fbfb50c SHA1 4fe511685e611386754bec1a0d540ff7061bf567 SHA256 93903e791fc1e69bc90663bf5e3c4fda510cfc9b38367ec1fc78f5e8280515e0 EBUILD cel-0.98.2.ebuild 964 RMD160 9d15462a6dec8d3b0470aeddadd6f6a799a0530c SHA1 00428a8673e05317b43cebf0d2e260df4db60064 SHA256 291469cdb769967637d4e8945a37fad166a23abe12a6a1e5e48a407d3ba4a9a5 MD5 40856da7b839bd4527ddcb776c4f1313 cel-0.98.2.ebuild 964 RMD160 9d15462a6dec8d3b0470aeddadd6f6a799a0530c cel-0.98.2.ebuild 964 SHA256 291469cdb769967637d4e8945a37fad166a23abe12a6a1e5e48a407d3ba4a9a5 cel-0.98.2.ebuild 964 -EBUILD cel-1.0.ebuild 1110 RMD160 917397d66f14df88ab6c5b25c48e3a9e14415250 SHA1 a0b35dab2e99f8d43f5eee19c2fa75bcfba6fe39 SHA256 bc172244e443047a71390ad6ef726aac2c0e15932da89390b02ea763fbe2ea75 -MD5 9e7b134d6926c0bf8c2a1de3b53d557e cel-1.0.ebuild 1110 -RMD160 917397d66f14df88ab6c5b25c48e3a9e14415250 cel-1.0.ebuild 1110 -SHA256 bc172244e443047a71390ad6ef726aac2c0e15932da89390b02ea763fbe2ea75 cel-1.0.ebuild 1110 -MISC ChangeLog 2705 RMD160 f3b87de4d233944e095385b8a23153b734792654 SHA1 b3d58b9452b8011de4b256ee3bd86c62468c41f7 SHA256 5bec46e4a11b07ec06d9e56646f4445d2d83332504fe23bf48cb2c6bf32ba46d -MD5 8e5bf558c52275609de4e720feb1be96 ChangeLog 2705 -RMD160 f3b87de4d233944e095385b8a23153b734792654 ChangeLog 2705 -SHA256 5bec46e4a11b07ec06d9e56646f4445d2d83332504fe23bf48cb2c6bf32ba46d ChangeLog 2705 +EBUILD cel-1.0.ebuild 1193 RMD160 5d7bac043974a072ab1cced6f243e4101a5f33e5 SHA1 fb447e96638127325b95e64910a5d2ade5319aca SHA256 af61b8ca9cccccbd7e062cfafe3f30fa0179255408559f580c05e2bead7e94f0 +MD5 dec0eeecd0f2a32841e7010635757dbf cel-1.0.ebuild 1193 +RMD160 5d7bac043974a072ab1cced6f243e4101a5f33e5 cel-1.0.ebuild 1193 +SHA256 af61b8ca9cccccbd7e062cfafe3f30fa0179255408559f580c05e2bead7e94f0 cel-1.0.ebuild 1193 +MISC ChangeLog 2818 RMD160 468f6f28cddcf136fbae85f2687ff8279f193966 SHA1 e15c2b1b6e2adc38000bc989a84b3706b68e6e4a SHA256 f5e0c405ac05b79535983ce94c20d3e3474022532ad8464a7e266b56e9fa10cd +MD5 d5176e998484c60507d7319a7c558806 ChangeLog 2818 +RMD160 468f6f28cddcf136fbae85f2687ff8279f193966 ChangeLog 2818 +SHA256 f5e0c405ac05b79535983ce94c20d3e3474022532ad8464a7e266b56e9fa10cd ChangeLog 2818 MISC metadata.xml 463 RMD160 cf696bb57924fa594ff1ebc44c577ede7b9a254e SHA1 d2e809533f01256a7188c397a38333fdb83efc3d SHA256 c96305c874ff05e3287baf97bd5e9d6d58749156b33e596e8c31e1875a81baf1 MD5 78f796f369931ffa9a8cc4b41bca4152 metadata.xml 463 RMD160 cf696bb57924fa594ff1ebc44c577ede7b9a254e metadata.xml 463 @@ -26,9 +30,9 @@ MD5 676fa88e5753dcb52a6dee6bb2f8baf3 files/digest-cel-1.0 241 RMD160 69e5dcf44e1e69c558cda76ce75f5067641b2f38 files/digest-cel-1.0 241 SHA256 2ff2db5b357fb874e3af325bb2689e40953ae17ec118ecead48f3a4e9a19840b files/digest-cel-1.0 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFytE6dz7hIScOURERAgpFAJ9bn6TNGNTK3BSaXwP7D0fn5hG5+gCeJWr9 -WMX73d/9QWgm2UqwfqTAhvw= -=LP3t +iD8DBQFF1g9rbfN2jvlVAhwRAl8tAJ90IOpKnqYgfgLq2cgT57JnHOz4lACfSa2K +rL3SDTAjSo1Pc0bgcGpsLcY= +=85dB -----END PGP SIGNATURE----- diff --git a/dev-games/cel/cel-1.0.ebuild b/dev-games/cel/cel-1.0.ebuild index c56ae30c2da1..b7ecf784f1b2 100644 --- a/dev-games/cel/cel-1.0.ebuild +++ b/dev-games/cel/cel-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/cel-1.0.ebuild,v 1.2 2007/02/08 07:28:51 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/cel-1.0.ebuild,v 1.3 2007/02/16 20:09:03 tupone Exp $ inherit eutils @@ -21,6 +21,12 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}"-amd64.patch +} + src_compile() { econf \ --disable-separate-debug-info \ diff --git a/dev-games/cel/files/cel-1.0-amd64.patch b/dev-games/cel/files/cel-1.0-amd64.patch new file mode 100644 index 000000000000..b909a4183cbc --- /dev/null +++ b/dev-games/cel/files/cel-1.0-amd64.patch @@ -0,0 +1,25 @@ +--- plugins/network/tcp/tcpgameclient.cpp.old 2007-02-16 20:03:01.000000000 +0100 ++++ plugins/network/tcp/tcpgameclient.cpp 2007-02-16 20:04:06.000000000 +0100 +@@ -341,7 +341,9 @@ + packet->Read (temp_game_info.game_name); + packet->Read (temp_game_info.hostname); + packet->Read (temp_game_info.port_nb); +- packet->Read (temp_game_info.max_players); ++ uint32 max_players; ++ packet->Read (max_players); ++ temp_game_info.max_players = max_players; + packet->Read (temp_game_info.custom_data); + if (!game->IsServerAvailable ()) + game->game_info = temp_game_info; +--- plugins/network/tcp/tcpgameserver.cpp.old 2007-02-16 20:03:12.000000000 +0100 ++++ plugins/network/tcp/tcpgameserver.cpp 2007-02-16 20:08:18.000000000 +0100 +@@ -450,7 +450,8 @@ + answer_packet->Write (game->game_info.game_name); + answer_packet->Write (game->game_info.hostname); + answer_packet->Write (game->game_info.port_nb); +- answer_packet->Write (game->game_info.max_players); ++ uint32 max_players = game->game_info.max_players; ++ answer_packet->Write (max_players); + answer_packet->Write (game->game_info.custom_data); + + // send packet -- 2.26.2