diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 15:38:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 15:38:23 +0000 |
| commit | 7ef60b45469231cf945df45ba08c53cf57e5f519 (patch) | |
| tree | 705607ce0eaa36c00cf1ea11b027e8207b76fd39 /games-fps/warsow | |
| parent | stable x86, bug 301301 (diff) | |
| download | gentoo-2-7ef60b45469231cf945df45ba08c53cf57e5f519.tar.gz gentoo-2-7ef60b45469231cf945df45ba08c53cf57e5f519.tar.bz2 gentoo-2-7ef60b45469231cf945df45ba08c53cf57e5f519.zip | |
Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by Jimmy Jazz.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'games-fps/warsow')
| -rw-r--r-- | games-fps/warsow/ChangeLog | 8 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-0.5-r1.ebuild | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 7f9a538d2455..f9aee3c9c946 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/warsow -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.25 2009/11/14 17:04:23 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.26 2010/01/19 15:38:23 ssuominen Exp $ + + 19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> warsow-0.5-r1.ebuild: + Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by + Jimmy Jazz. *warsow-0.5-r1 (14 Nov 2009) diff --git a/games-fps/warsow/warsow-0.5-r1.ebuild b/games-fps/warsow/warsow-0.5-r1.ebuild index 9f1c0420aace..da60ab32eb15 100644 --- a/games-fps/warsow/warsow-0.5-r1.ebuild +++ b/games-fps/warsow/warsow-0.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5-r1.ebuild,v 1.1 2009/11/14 17:04:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5-r1.ebuild,v 1.2 2010/01/19 15:38:23 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs versionator games @@ -45,6 +45,10 @@ src_prepare() { -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \ qcommon/files.c \ || die "sed files.c failed" + + sed -i \ + -e "s:jpeg_mem_src:_&:" \ + ref_gl/r_image.c || die cd "${WORKDIR}" rm -rf docs/old |