diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-04 09:32:44 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-04 09:32:44 +0000 |
commit | 7c5b030458159959dd80c3914fba4ab45ad9d637 (patch) | |
tree | dd87861771e4cbc12febf79f6577c96c06f2fa0c | |
parent | Fix building with GLIBC 2.10+ wrt #282431. (diff) | |
download | gentoo-2-7c5b030458159959dd80c3914fba4ab45ad9d637.tar.gz gentoo-2-7c5b030458159959dd80c3914fba4ab45ad9d637.tar.bz2 gentoo-2-7c5b030458159959dd80c3914fba4ab45ad9d637.zip |
Fix building with GLIBC 2.10+ wrt #273557 by Arttu Valo.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
-rw-r--r-- | games-arcade/xevil/ChangeLog | 8 | ||||
-rw-r--r-- | games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch | 20 | ||||
-rw-r--r-- | games-arcade/xevil/xevil-2.02_p2-r1.ebuild | 5 |
3 files changed, 29 insertions, 4 deletions
diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog index e736ed24908b..38ac4232f720 100644 --- a/games-arcade/xevil/ChangeLog +++ b/games-arcade/xevil/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/xevil -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.12 2008/01/06 01:27:58 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.13 2009/09/04 09:32:43 ssuominen Exp $ + + 04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> + xevil-2.02_p2-r1.ebuild, +files/xevil-2.02_p2-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #273557 by Arttu Valo. 06 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> xevil-2.02_p2-r1.ebuild: diff --git a/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch b/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch new file mode 100644 index 000000000000..5375f2208a0d --- /dev/null +++ b/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch @@ -0,0 +1,20 @@ +diff -ur cmn.old/utils.h cmn/utils.h +--- cmn.old/utils.h 2009-08-22 02:16:21.000000000 +0300 ++++ cmn/utils.h 2009-08-22 02:26:33.000000000 +0300 +@@ -238,13 +238,13 @@ + same. */ + + static char* strchr(const char* cs,int c) +- {return ::strchr(cs,c);} ++ {return const_cast<char*>(::strchr(cs,c));} + + static char* strrchr(const char* cs,int c) +- {return ::strrchr(cs,c);} ++ {return const_cast<char*>(::strrchr(cs,c));} + + static char* strstr(const char* cs,const char* ct) +- {return ::strstr(cs,ct);} ++ {return const_cast<char*>(::strstr(cs,ct));} + + static void strcpy(char* s,const char* ct) + {::strcpy(s,ct);} diff --git a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild index e2b4d4da6aa3..93173ec00831 100644 --- a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild +++ b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2-r1.ebuild,v 1.3 2008/01/06 01:27:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2-r1.ebuild,v 1.4 2009/09/04 09:32:43 ssuominen Exp $ inherit eutils games @@ -31,6 +31,7 @@ src_unpack() { -e "s:CFLAGS=\":CFLAGS=\"${CFLAGS} :g" \ -e 's:-lXpm:-lXpm -lpthread:g' \ config.mk || die "sed failed" + epatch "${FILESDIR}"/${P}-glibc-2.10.patch } src_compile() { |