diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-01-22 05:35:51 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-01-22 05:35:51 +0000 |
| commit | b91667bd44ab661d6a6e01cd710af55e764605f1 (patch) | |
| tree | 2cab9a329d423ad286d2784d9085d9356991bd7d | |
| parent | version bump from upstream (diff) | |
| download | gentoo-2-b91667bd44ab661d6a6e01cd710af55e764605f1.tar.gz gentoo-2-b91667bd44ab661d6a6e01cd710af55e764605f1.tar.bz2 gentoo-2-b91667bd44ab661d6a6e01cd710af55e764605f1.zip | |
Fix compilation with gcc 4.2, bug #206388
(Portage version: 2.1.4)
| -rw-r--r-- | games-mud/mcl/ChangeLog | 8 | ||||
| -rw-r--r-- | games-mud/mcl/files/mcl-0.53.00-gcc42.patch | 13 | ||||
| -rw-r--r-- | games-mud/mcl/mcl-0.53.00.ebuild | 7 |
3 files changed, 23 insertions, 5 deletions
diff --git a/games-mud/mcl/ChangeLog b/games-mud/mcl/ChangeLog index 4a247d5f337a..30f90201de46 100644 --- a/games-mud/mcl/ChangeLog +++ b/games-mud/mcl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-mud/mcl -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.16 2007/10/21 05:54:09 mr_bones_ Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.17 2008/01/22 05:35:50 nyhm Exp $ + + 22 Jan 2008; Tristan Heaven <nyhm@gentoo.org> + +files/mcl-0.53.00-gcc42.patch, mcl-0.53.00.ebuild: + Fix compilation with gcc 4.2, bug #206388 21 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org> +files/mcl-0.53.00-inputlines.patch, mcl-0.53.00.ebuild: diff --git a/games-mud/mcl/files/mcl-0.53.00-gcc42.patch b/games-mud/mcl/files/mcl-0.53.00-gcc42.patch new file mode 100644 index 000000000000..553f3c0fe18f --- /dev/null +++ b/games-mud/mcl/files/mcl-0.53.00-gcc42.patch @@ -0,0 +1,13 @@ +--- OutputWindow.cc ++++ OutputWindow.cc +@@ -229,8 +229,8 @@ + highlight.len = strlen(s); + + // Show on the second line rather than under status bar +- viewpoint = scrollback >? p-width; +- viewpoint = viewpoint <? canvas; ++ viewpoint = scrollback > p-width ? scrollback : p-width; ++ viewpoint = viewpoint < canvas ? viewpoint : canvas; + status->setf("Found string '%s'", s); + } + } diff --git a/games-mud/mcl/mcl-0.53.00.ebuild b/games-mud/mcl/mcl-0.53.00.ebuild index fa0aa6da33e0..3d72cfac16e4 100644 --- a/games-mud/mcl/mcl-0.53.00.ebuild +++ b/games-mud/mcl/mcl-0.53.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.16 2007/10/21 05:54:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.17 2008/01/22 05:35:50 nyhm Exp $ inherit eutils games @@ -26,7 +26,8 @@ src_unpack() { "${FILESDIR}"/${P}-gcc34.patch \ "${FILESDIR}"/${PV}-dynacomplete.patch \ "${FILESDIR}"/${P}-libdir.patch \ - "${FILESDIR}"/${P}-inputlines.patch + "${FILESDIR}"/${P}-inputlines.patch \ + "${FILESDIR}"/${P}-gcc42.patch sed -i \ -e "/MCL_LIBRARY_PATH/ s:/usr/lib/mcl:$(games_get_libdir)/${PN}:" \ |