From 7a58224ca631ec6e6c2c7ed1a79046bc644e49fe Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Mon, 31 Jan 2011 00:30:47 +0000 Subject: add Redhat patch to fix bot loading on 64bit (bug #353257) Package-Manager: portage-2.1.9.25/cvs/Linux i686 --- games-fps/quake3/ChangeLog | 8 ++++++-- games-fps/quake3/Manifest | 5 +++-- games-fps/quake3/files/quake3-1.36-bots.patch | 20 ++++++++++++++++++++ games-fps/quake3/quake3-1.36.ebuild | 7 +++++-- 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 games-fps/quake3/files/quake3-1.36-bots.patch (limited to 'games-fps') diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog index a67cecb56edc..5af7054c38c4 100644 --- a/games-fps/quake3/ChangeLog +++ b/games-fps/quake3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/quake3 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.55 2010/11/28 05:29:05 mr_bones_ Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.56 2011/01/31 00:30:47 mr_bones_ Exp $ + + 31 Jan 2011; Michael Sterrett quake3-1.36.ebuild, + +files/quake3-1.36-bots.patch: + add Redhat patch to fix bot loading on 64bit (bug #353257) 28 Nov 2010; Michael Sterrett quake3-1.36.ebuild, quake3-9999.ebuild: diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest index fc456b32d7ce..e4c017958f03 100644 --- a/games-fps/quake3/Manifest +++ b/games-fps/quake3/Manifest @@ -1,8 +1,9 @@ AUX quake3-1.34_rc3-gcc42.patch 766 RMD160 a584f52898bb9d8099dce89bcb88cd8fa099211d SHA1 72e524009f0f4bee75eadcc29ffc56bbbcf3d434 SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919 +AUX quake3-1.36-bots.patch 499 RMD160 71e280d72a5161fa5c72eeac6f38cb1c2b397579 SHA1 4ce200188ec705a2297cabfba64686a66de8f8e8 SHA256 b3510423a8486df90853bc1321dcec9dfdcdb1b2b3870495bca49bd8c5635e66 DIST ioquake3-1.36.tar.bz2 3503058 RMD160 af9f65bbde2fe5531fa371ec6d2023126a523293 SHA1 0f92891e2b174253d02f666fd22e147c886089b4 SHA256 79b10b92e9e586748a67089ac871646fe8144004d3ab4a55158348bc38d74821 DIST ioquake3_1.34-rc3.tar.bz2 3147694 RMD160 b270cd43a4f9f2700715cbd1487a8d0efab0296b SHA1 327d95a128aacc3bdd4e9497896651005cce8f92 SHA256 fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01 EBUILD quake3-1.34_rc3.ebuild 3039 RMD160 faf6f996abea6c308da7276530d9291ed1ee3706 SHA1 461b5b4e803595335e977b7bb93bbd51e75097e8 SHA256 c44f2d7119b022bb24151597f28733a6204fded6e6d52afbca435a6392a2cfc7 -EBUILD quake3-1.36.ebuild 2498 RMD160 5c0c1f3bb7423d3b3d66bc264bef0fb7f15682d5 SHA1 f205b611ec6c8f22a33c1a90a94ae80a80229452 SHA256 66b21a68ee6f20186e353ff27d7409f5e0385c707e702d4d1676427e9b95291f +EBUILD quake3-1.36.ebuild 2573 RMD160 723a08e8cd5d59c409b62c7f637636a31f209d12 SHA1 9a9b4fbc991a72e4d67720074124ca8ae114f409 SHA256 1eac955b505c5262e5cfb5b6c502c355ca9451f1549631f87369445d8b30df95 EBUILD quake3-9999.ebuild 2537 RMD160 371f1eeb33d769c7bce14362ba5c2c1933f3dc94 SHA1 5e4f2d74b9ad5766112db1c45909c06c5d8b05c3 SHA256 37765edbc59ce694cb711fa1d4c482085424c42536f5673a51dcebeea19566ee -MISC ChangeLog 5187 RMD160 bbe5a244c9ff83962a7257384171d89bbea3f4f5 SHA1 9573f633bd289eb1665674b39ccff536ad71362d SHA256 29b0874716f28a34d201d37c4276b157bc7b3ef9e44ebad60b044d4d956494e2 +MISC ChangeLog 5357 RMD160 328b271f61b8960d5eebb42fcbab94240739412f SHA1 5e5cb6d4082f60b909756a1a42f92c3396dfe0db SHA256 afd9e56f26d50ba39d5f94513dbff16ca27281b743816ee138a7734efc22c52c MISC metadata.xml 1052 RMD160 47127dc28337531fc3907c9d95f9d7d35d8e2d15 SHA1 08386bbbd1d751866a0201708cabfc8cbdfee975 SHA256 9552624bd6c0d0ac113dc2d283a41c556bd86948c5a14c98fb06e85948feb2aa diff --git a/games-fps/quake3/files/quake3-1.36-bots.patch b/games-fps/quake3/files/quake3-1.36-bots.patch new file mode 100644 index 000000000000..31d2f2041c6f --- /dev/null +++ b/games-fps/quake3/files/quake3-1.36-bots.patch @@ -0,0 +1,20 @@ +--- code/botlib/l_script.c.orig 2009-11-02 20:29:23.000000000 +0100 ++++ code/botlib/l_script.c 2009-11-02 22:21:40.000000000 +0100 +@@ -1118,7 +1118,7 @@ + { + if (*string == '\"') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string)); + } //end if + if (string[strlen(string)-1] == '\"') + { +@@ -1135,7 +1135,7 @@ + { + if (*string == '\'') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string)); + } //end if + if (string[strlen(string)-1] == '\'') + { diff --git a/games-fps/quake3/quake3-1.36.ebuild b/games-fps/quake3/quake3-1.36.ebuild index a6d572b001a8..5f6be5b7f168 100644 --- a/games-fps/quake3/quake3-1.36.ebuild +++ b/games-fps/quake3/quake3-1.36.ebuild @@ -1,6 +1,6 @@ -# 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-fps/quake3/quake3-1.36.ebuild,v 1.2 2010/11/28 05:29:05 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.36.ebuild,v 1.3 2011/01/31 00:30:47 mr_bones_ Exp $ # quake3-9999 -> latest svn # quake3-9999.REV -> use svn REV @@ -49,6 +49,9 @@ src_unpack() { src_prepare() { sed -i -e '/INSTALL/s: -s : :' Makefile || die + if [[ ${PV} != 9999* ]] ; then + epatch "${FILESDIR}"/${P}-bots.patch + fi } src_compile() { -- cgit v1.2.3-65-gdbad